ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Thu Dec 21 23:22:29 2023 +0200| [6d045187880c9209e8d2a4b995acba7284088f83] | committer: Martin Storsjö
configure: Remove/factorize a redundant check for UWP mode The check for UWP mode was duplicated from right above, in d54127c41a81cf2078a3504f78e0e4232cfe11b7. Also, instead of several lines with "enabled uwp && ...", make one "if enabled uwp; then" block. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d045187880c9209e8d2a4b995acba7284088f83 --- configure | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/configure b/configure index af0bebc1ac..69b755f274 100755 --- a/configure +++ b/configure @@ -7102,9 +7102,8 @@ fi check_func_headers "windows.h" CreateDIBSection "$gdigrab_indev_extralibs" -# d3d11va requires linking directly to dxgi and d3d11 if not building for -# the desktop api partition -test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11" +# check if building for desktop or uwp +test_cpp <<EOF && enable uwp #ifdef WINAPI_FAMILY #include <winapifamily.h> #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) @@ -7117,23 +7116,16 @@ test_cpp <<EOF && enable uwp && d3d11va_extralibs="-ldxgi -ld3d11" #endif EOF -# vaapi_win32 requires linking directly to dxgi if not building for -# 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_extralibs="-lmfuuid -lole32 -lstrmiids" -# mediafoundation requires linking directly to mfplat if building for uwp target -enabled uwp && mediafoundation_extralibs="-lmfplat -lmfuuid -lole32 -lstrmiids" || mediafoundation_extralibs="-lmfuuid -lole32 -lstrmiids" +if enabled uwp; then + # 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 && check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".