diff options
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/windowsstore/ArchSetup.cmake | 3 | ||||
| -rw-r--r-- | tools/buildsteps/windows/buildffmpeg.sh | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 9c382da91c..a3a7183d24 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -73,7 +73,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 Mfplat.lib Mfuuid.lib Strmiids.lib) + crypt32.lib) # NODEFAULTLIB option set(_nodefaultlibs_RELEASE libcmt) diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake index 5a9068350f..478bcebdc5 100644 --- a/cmake/scripts/windowsstore/ArchSetup.cmake +++ b/cmake/scripts/windowsstore/ArchSetup.cmake @@ -91,8 +91,7 @@ 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 - Mfplat.lib Mfuuid.lib Strmiids.lib) +list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.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") diff --git a/tools/buildsteps/windows/buildffmpeg.sh b/tools/buildsteps/windows/buildffmpeg.sh index 14e48c850a..f2e72cb3c7 100644 --- a/tools/buildsteps/windows/buildffmpeg.sh +++ b/tools/buildsteps/windows/buildffmpeg.sh @@ -84,6 +84,7 @@ do_addOption "--disable-gnutls" do_addOption "--enable-openssl" do_addOption "--enable-nonfree" do_addOption "--toolchain=msvc" +do_addOption "--disable-mediafoundation" if [ "$ARCH" == "x86_64" ]; then FFMPEG_TARGET_OS=win64 |