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

(Windows) Added bundling of C++ libraries when building with MSVC

Browse source
This commit is contained in:
Leon Styhre 2023-11-02 16:35:40 +01:00
parent d7ec11739d
commit e8c18ca5e7
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
es-app/CMakeLists.txt
View file

@ -144,6 +144,10 @@ if(WIN32)
install(TARGETS EmulationStation RUNTIME DESTINATION .) install(TARGETS EmulationStation RUNTIME DESTINATION .)
install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter) install(TARGETS es-pdf-convert RUNTIME DESTINATION es-pdf-converter)
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
if(CMAKE_BUILD_TYPE MATCHES Debug)
set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
endif()
install(FILES ../avcodec-60.dll install(FILES ../avcodec-60.dll
../avfilter-9.dll ../avfilter-9.dll
../avformat-60.dll ../avformat-60.dll
@ -159,13 +163,10 @@ if(WIN32)
../libcurl-x64.dll ../libcurl-x64.dll
../libssl-1_1-x64.dll ../libssl-1_1-x64.dll
../lunasvg.dll ../lunasvg.dll
../MSVCP140.dll
../pugixml.dll ../pugixml.dll
../rlottie.dll ../rlottie.dll
../SDL2.dll ../SDL2.dll
../VCOMP140.DLL ../vcomp140.dll
../VCRUNTIME140.dll
../VCRUNTIME140_1.dll
DESTINATION .) DESTINATION .)
install(FILES ../es-pdf-converter/charset.dll install(FILES ../es-pdf-converter/charset.dll
../es-pdf-converter/deflate.dll ../es-pdf-converter/deflate.dll

5
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -326,10 +326,7 @@ if exist "C:\Program Files\OpenSSL-Win64\libcrypto-1_1-x64.dll" (
echo: echo:
echo Copying DLL files from Windows\System32 echo Copying DLL files from Windows\System32
copy /Y C:\Windows\System32\MSVCP140.dll copy /Y C:\Windows\System32\vcomp140.dll
copy /Y C:\Windows\System32\VCOMP140.DLL
copy /Y C:\Windows\System32\VCRUNTIME140.dll
copy /Y C:\Windows\System32\VCRUNTIME140_1.dll
echo: echo:
echo Done setting up all dependencies. echo Done setting up all dependencies.