diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-06-17 12:14:12 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-06-19 10:21:02 -0700 |
| commit | 84bb46f393dde388031daef78724a0ed2d6f8c4e (patch) | |
| tree | 3589bac89f5a01e13483bf99c898f7cffbe8812e /cmake/scripts | |
| parent | 513dae9721222acd760fed9174d7f5b36e25516c (diff) | |
FFmpeg: Bump to 4.3-Matrix-Alpha1
Diffstat (limited to 'cmake/scripts')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 00f92836d8..f3628f29da 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -71,7 +71,7 @@ link_directories(${DEPENDENCIES_DIR}/lib) # Additional libraries list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib version.lib - crypt32.lib) + crypt32.lib Mfplat.lib Mfuuid.lib Strmiids.lib) # NODEFAULTLIB option set(_nodefaultlibs_RELEASE libcmt) diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index fdc04a4417..ad55a01ac8 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -91,7 +91,8 @@ set(gtest_force_shared_crt ON CACHE STRING "" FORCE) link_directories(${MINGW_LIBS_DIR}/lib ${DEPENDENCIES_DIR}/lib) -list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib) +list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib + Mfplat.lib Mfuuid.lib Strmiids.lib) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO") set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt /DEBUG:FASTLINK /OPT:NOREF /OPT:NOICF") |