diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bbb661f9..c5c2f7531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,6 +292,11 @@ if(NOT WIN32) elseif(WIN32) if(DEFINED MSVC) set(COMMON_LIBRARIES + "${PROJECT_SOURCE_DIR}/avcodec.lib" + "${PROJECT_SOURCE_DIR}/avformat.lib" + "${PROJECT_SOURCE_DIR}/avutil.lib" + "${PROJECT_SOURCE_DIR}/swresample.lib" + "${PROJECT_SOURCE_DIR}/swscale.lib" "${PROJECT_SOURCE_DIR}/FreeImage.lib" "${PROJECT_SOURCE_DIR}/glew32.lib" "${PROJECT_SOURCE_DIR}/libcurl-x64.lib" @@ -304,6 +309,11 @@ elseif(WIN32) "Winmm.dll") else() set(COMMON_LIBRARIES + "${PROJECT_SOURCE_DIR}/avcodec-59.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}/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 a8dd50af7..badad70b5 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -117,14 +117,16 @@ endif() if(WIN32) install(TARGETS EmulationStation RUNTIME DESTINATION .) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll - ../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll - ../libvlccore.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL ../VCRUNTIME140.dll - ../VCRUNTIME140_1.dll DESTINATION .) + install(FILES ../avcodec-59.dll ../avformat-59.dll ../avutil-57.dll ../swresample-4.dll + ../swscale-6.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll + ../libcurl-x64.dll ../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll + ../libvlc.dll ../libvlccore.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL + ../VCRUNTIME140.dll ../VCRUNTIME140_1.dll DESTINATION .) else() - install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll - ../libfreetype.dll ../libpugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll - ../libvlccore.dll ../SDL2.dll ../vcomp140.dll DESTINATION .) + install(FILES ../avcodec-59.dll ../avformat-59.dll ../avutil-57.dll ../swresample-4.dll + ../swscale-6.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll + ../libcurl-x64.dll ../libfreetype.dll ../libpugixml.dll ../libssl-1_1-x64.dll + ../libvlc.dll ../libvlccore.dll ../SDL2.dll ../vcomp140.dll DESTINATION .) endif() install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins DESTINATION .) install(FILES ../LICENSE DESTINATION .)