From 840dc13285ca4d64b429ab89671fef298a21ed9a Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 13 Jul 2021 21:47:55 +0200 Subject: [PATCH] (Windows) Fixed an issue where the wrong FFmpeg version was bundled. --- CMakeLists.txt | 12 ++++++------ es-app/CMakeLists.txt | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4059d6ef9..782a2a7b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,12 +307,12 @@ elseif(WIN32) endif() else() set(COMMON_LIBRARIES - "${PROJECT_SOURCE_DIR}/avcodec-59.dll" - "${PROJECT_SOURCE_DIR}/avfilter-8.dll" - "${PROJECT_SOURCE_DIR}/avformat-59.dll" - "${PROJECT_SOURCE_DIR}/avutil-57.dll" - "${PROJECT_SOURCE_DIR}/swresample-4.dll" - "${PROJECT_SOURCE_DIR}/swscale-6.dll" + "${PROJECT_SOURCE_DIR}/avcodec-58.dll" + "${PROJECT_SOURCE_DIR}/avfilter-7.dll" + "${PROJECT_SOURCE_DIR}/avformat-58.dll" + "${PROJECT_SOURCE_DIR}/avutil-56.dll" + "${PROJECT_SOURCE_DIR}/swresample-3.dll" + "${PROJECT_SOURCE_DIR}/swscale-5.dll" "${PROJECT_SOURCE_DIR}/FreeImage.dll" "${PROJECT_SOURCE_DIR}/glew32.dll" "${PROJECT_SOURCE_DIR}/libcurl-x64.dll" diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 9187aa617..271ed4cfa 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -127,8 +127,8 @@ endif() if(WIN32) install(TARGETS EmulationStation RUNTIME DESTINATION .) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - install(FILES ../avcodec-59.dll ../avfilter-8.dll ../avformat-59.dll ../avutil-57.dll - ../postproc-56.dll ../swresample-4.dll ../swscale-6.dll ../FreeImage.dll + install(FILES ../avcodec-58.dll ../avfilter-7.dll ../avformat-58.dll ../avutil-56.dll + ../postproc-55.dll ../swresample-3.dll ../swscale-5.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll ../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL ../VCRUNTIME140.dll ../VCRUNTIME140_1.dll DESTINATION .) @@ -136,8 +136,8 @@ if(WIN32) install(FILES ../libvlc.dll ../libvlccore.dll DESTINATION .) endif() else() - install(FILES ../avcodec-59.dll ../avfilter-8.dll ../avformat-59.dll ../avutil-57.dll - ../postproc-56.dll ../swresample-4.dll ../swscale-6.dll ../FreeImage.dll + install(FILES ../avcodec-58.dll ../avfilter-7.dll ../avformat-58.dll ../avutil-56.dll + ../postproc-55.dll ../swresample-3.dll ../swscale-5.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll ../libfreetype.dll ../libpugixml.dll ../libssl-1_1-x64.dll ../SDL2.dll ../vcomp140.dll DESTINATION .) if(VLC_PLAYER)