Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Updated the CMake files to include the FFmpeg libraries for building and packaging.

Browse source
This commit is contained in:
Leon Styhre 2021-05-13 11:35:56 +02:00
parent 4a42f929b3
commit d13967b8fb
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -292,6 +292,11 @@ if(NOT WIN32)
elseif(WIN32) elseif(WIN32)
if(DEFINED MSVC) if(DEFINED MSVC)
set(COMMON_LIBRARIES 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}/FreeImage.lib"
"${PROJECT_SOURCE_DIR}/glew32.lib" "${PROJECT_SOURCE_DIR}/glew32.lib"
"${PROJECT_SOURCE_DIR}/libcurl-x64.lib" "${PROJECT_SOURCE_DIR}/libcurl-x64.lib"
@ -304,6 +309,11 @@ elseif(WIN32)
"Winmm.dll") "Winmm.dll")
else() else()
set(COMMON_LIBRARIES 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}/FreeImage.dll"
"${PROJECT_SOURCE_DIR}/glew32.dll" "${PROJECT_SOURCE_DIR}/glew32.dll"
"${PROJECT_SOURCE_DIR}/libcurl-x64.dll" "${PROJECT_SOURCE_DIR}/libcurl-x64.dll"

16
es-app/CMakeLists.txt
View file

@ -117,14 +117,16 @@ endif()
if(WIN32) if(WIN32)
install(TARGETS EmulationStation RUNTIME DESTINATION .) install(TARGETS EmulationStation RUNTIME DESTINATION .)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll install(FILES ../avcodec-59.dll ../avformat-59.dll ../avutil-57.dll ../swresample-4.dll
../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll ../swscale-6.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll
../libvlccore.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL ../VCRUNTIME140.dll ../libcurl-x64.dll ../freetype.dll ../pugixml.dll ../libssl-1_1-x64.dll
../VCRUNTIME140_1.dll DESTINATION .) ../libvlc.dll ../libvlccore.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL
../VCRUNTIME140.dll ../VCRUNTIME140_1.dll DESTINATION .)
else() else()
install(FILES ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll install(FILES ../avcodec-59.dll ../avformat-59.dll ../avutil-57.dll ../swresample-4.dll
../libfreetype.dll ../libpugixml.dll ../libssl-1_1-x64.dll ../libvlc.dll ../swscale-6.dll ../FreeImage.dll ../glew32.dll ../libcrypto-1_1-x64.dll
../libvlccore.dll ../SDL2.dll ../vcomp140.dll DESTINATION .) ../libcurl-x64.dll ../libfreetype.dll ../libpugixml.dll ../libssl-1_1-x64.dll
../libvlc.dll ../libvlccore.dll ../SDL2.dll ../vcomp140.dll DESTINATION .)
endif() endif()
install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins DESTINATION .) install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins DESTINATION .)
install(FILES ../LICENSE DESTINATION .) install(FILES ../LICENSE DESTINATION .)