diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-09 14:27:33 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-09 15:27:43 -0300 |
| commit | 28f5753fed4b462c868ce5a952fb770246620fa0 (patch) | |
| tree | efc0734b72d936fc05934ee11cfb8210a6729231 /configure | |
| parent | bf7ae32a081432fed786a126a6b385495aae7945 (diff) | |
| download | ffmpeg-28f5753fed4b462c868ce5a952fb770246620fa0.tar.gz | |
configure: fix the non pkg-config libmfx check on Windows
Based on a patch by Aaron Levinson.
Reviewed-by: alevinsn
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -5824,6 +5824,7 @@ check_header asm/types.h # so we also check that atomics actually work here check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)" +check_lib advapi32 "windows.h" RegCloseKey -ladvapi32 check_lib ole32 "windows.h" CoTaskMemFree -lole32 check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32 @@ -5981,7 +5982,7 @@ enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kv # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. enabled libmfx && { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } + { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa $zlib_extralibs |