configure: Remove/factorize a redundant check for UWP mode
The check for UWP mode was duplicated from right above, in
d54127c41a
.
Also, instead of several lines with "enabled uwp && ...", make one
"if enabled uwp; then" block.
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
45b4781e9a
commit
6d04518788
30
configure
vendored
30
configure
vendored
@ -7102,9 +7102,8 @@ fi
|
|||||||
|
|
||||||
check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
|
check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs"
|
||||||
|
|
||||||
# d3d11va requires linking directly to dxgi and d3d11 if not building for
|
# check if building for desktop or uwp
|
||||||
# the desktop api partition
|
test_cpp <<EOF && enable uwp
|
||||||
test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
|
|
||||||
#ifdef WINAPI_FAMILY
|
#ifdef WINAPI_FAMILY
|
||||||
#include <winapifamily.h>
|
#include <winapifamily.h>
|
||||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
||||||
@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11"
|
|||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# vaapi_win32 requires linking directly to dxgi if not building for
|
mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
|
||||||
# the desktop api partition
|
|
||||||
test_cpp <<EOF && enable uwp && vaapi_win32_extralibs="-ldxgi"
|
|
||||||
#ifdef WINAPI_FAMILY
|
|
||||||
#include <winapifamily.h>
|
|
||||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
|
||||||
#error desktop, not uwp
|
|
||||||
#else
|
|
||||||
// WINAPI_FAMILY_APP, WINAPI_FAMILY_PHONE_APP => UWP
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#error no family set
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# mediafoundation requires linking directly to mfplat if building for uwp target
|
if enabled uwp; then
|
||||||
enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids"
|
# In UWP mode, we can't use LoadLibrary+GetProcAddress to conditionally
|
||||||
|
# try to load these APIs at runtime, like we do in regular desktop mode -
|
||||||
|
# therefore, we need to link directly against these APIs.
|
||||||
|
d3d11va_extralibs="-ldxgi -ld3d11"
|
||||||
|
vaapi_win32_extralibs="-ldxgi"
|
||||||
|
mediafoundation_extralibs="-lmfplat $mediafoundation_extralibs"
|
||||||
|
fi
|
||||||
|
|
||||||
enabled libdrm &&
|
enabled libdrm &&
|
||||||
check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2
|
check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2
|
||||||
|
Loading…
Reference in New Issue
Block a user