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

(Windows) Updated FFmpeg to 5.0 and SDL to 2.0.20.

Browse source
This commit is contained in:
Leon Styhre 2022-04-15 11:13:15 +02:00
parent e9ddfba797
commit 86c67ad256
4 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -354,11 +354,11 @@ elseif(WIN32)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.80.0-win64-mingw/include ${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.80.0-win64-mingw/include
${CMAKE_CURRENT_SOURCE_DIR}/external/glew-2.1.0/include ${CMAKE_CURRENT_SOURCE_DIR}/external/glew-2.1.0/include
${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n4.4-latest-win64-gpl-shared-4.4/include ${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n5.0-latest-win64-gpl-shared-5.0/include
${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64 ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include
${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src
${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.0.18) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.0.20)
elseif(EMSCRIPTEN) elseif(EMSCRIPTEN)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include
@ -426,12 +426,12 @@ elseif(WIN32)
${PROJECT_SOURCE_DIR}/SDL2.lib ${PROJECT_SOURCE_DIR}/SDL2.lib
Winmm.dll) Winmm.dll)
else() else()
set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-58.dll set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec-59.dll
${PROJECT_SOURCE_DIR}/avfilter-7.dll ${PROJECT_SOURCE_DIR}/avfilter-8.dll
${PROJECT_SOURCE_DIR}/avformat-58.dll ${PROJECT_SOURCE_DIR}/avformat-59.dll
${PROJECT_SOURCE_DIR}/avutil-56.dll ${PROJECT_SOURCE_DIR}/avutil-57.dll
${PROJECT_SOURCE_DIR}/swresample-3.dll ${PROJECT_SOURCE_DIR}/swresample-4.dll
${PROJECT_SOURCE_DIR}/swscale-5.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

28
es-app/CMakeLists.txt
View file

@ -126,13 +126,13 @@ 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 ../avcodec-58.dll install(FILES ../avcodec-59.dll
../avfilter-7.dll ../avfilter-8.dll
../avformat-58.dll ../avformat-59.dll
../avutil-56.dll ../avutil-57.dll
../postproc-55.dll ../postproc-56.dll
../swresample-3.dll ../swresample-4.dll
../swscale-5.dll ../swscale-6.dll
../FreeImage.dll ../FreeImage.dll
../freetype.dll ../freetype.dll
../glew32.dll ../glew32.dll
@ -148,13 +148,13 @@ if(WIN32)
../VCRUNTIME140_1.dll ../VCRUNTIME140_1.dll
DESTINATION .) DESTINATION .)
else() else()
install(FILES ../avcodec-58.dll install(FILES ../avcodec-59.dll
../avfilter-7.dll ../avfilter-8.dll
../avformat-58.dll ../avformat-59.dll
../avutil-56.dll ../avutil-57.dll
../postproc-55.dll ../postproc-56.dll
../swresample-3.dll ../swresample-4.dll
../swscale-5.dll ../swscale-6.dll
../FreeImage.dll ../FreeImage.dll
../glew32.dll ../glew32.dll
../libcrypto-1_1-x64.dll ../libcrypto-1_1-x64.dll

50
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -105,41 +105,41 @@ cd ..
echo: echo:
echo Setting up SDL echo Setting up SDL
if exist SDL2-2.0.18\ ( if exist SDL2-2.0.20\ (
rmdir /S /Q SDL2-2.0.18 rmdir /S /Q SDL2-2.0.20
) )
curl -O https://www.libsdl.org/release/SDL2-devel-2.0.18-VC.zip curl -O https://www.libsdl.org/release/SDL2-devel-2.0.20-VC.zip
7z x SDL2-devel-2.0.18-VC.zip 7z x SDL2-devel-2.0.20-VC.zip
cd SDL2-2.0.18 cd SDL2-2.0.20
rename include SDL2 rename include SDL2
cd .. cd ..
copy /Y SDL2-2.0.18\lib\x64\SDL2.dll .. copy /Y SDL2-2.0.20\lib\x64\SDL2.dll ..
copy /Y SDL2-2.0.18\lib\x64\SDL2.lib .. copy /Y SDL2-2.0.20\lib\x64\SDL2.lib ..
copy /Y SDL2-2.0.18\lib\x64\SDL2main.lib .. copy /Y SDL2-2.0.20\lib\x64\SDL2main.lib ..
echo: echo:
echo Setting up FFmpeg echo Setting up FFmpeg
if exist ffmpeg-n4.4-latest-win64-gpl-shared-4.4\ ( if exist ffmpeg-n5.0-latest-win64-gpl-shared-5.0\ (
rmdir /S /Q ffmpeg-n4.4-latest-win64-gpl-shared-4.4 rmdir /S /Q ffmpeg-n5.0-latest-win64-gpl-shared-5.0
) )
curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n4.4-latest-win64-gpl-shared-4.4.zip curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip
7z x ffmpeg-n4.4-latest-win64-gpl-shared-4.4.zip 7z x ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\avcodec-58.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\avcodec-59.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\avfilter-7.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\avfilter-8.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\avformat-58.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\avformat-59.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\avutil-56.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\avutil-57.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\postproc-55.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\postproc-56.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\swresample-3.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\swresample-4.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\bin\swscale-5.dll .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\bin\swscale-6.dll ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\avcodec.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\avcodec.lib ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\avfilter.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\avfilter.lib ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\avformat.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\avformat.lib ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\avutil.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\avutil.lib ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\swresample.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\swresample.lib ..
copy /Y ffmpeg-n4.4-latest-win64-gpl-shared-4.4\lib\swscale.lib .. copy /Y ffmpeg-n5.0-latest-win64-gpl-shared-5.0\lib\swscale.lib ..
echo: echo:
echo Setting up OpenSSL echo Setting up OpenSSL

28
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -59,26 +59,26 @@ cd ..
echo -e "\nSetting up SDL" echo -e "\nSetting up SDL"
rm -rf SDL2-* rm -rf SDL2-*
curl -O https://www.libsdl.org/release/SDL2-devel-2.0.18-mingw.tar.gz curl -O https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz
tar xvzf SDL2-devel-2.0.18-mingw.tar.gz tar xvzf SDL2-devel-2.0.20-mingw.tar.gz
# Needed due to some kind of file system race condition that sometimes occurs on Windows. # Needed due to some kind of file system race condition that sometimes occurs on Windows.
sleep 1 sleep 1
mv SDL2-2.0.18/x86_64-w64-mingw32/include/SDL2 SDL2-2.0.18/ mv SDL2-2.0.20/x86_64-w64-mingw32/include/SDL2 SDL2-2.0.20/
cp -p SDL2-2.0.18/x86_64-w64-mingw32/lib/libSDL2main.a .. cp -p SDL2-2.0.20/x86_64-w64-mingw32/lib/libSDL2main.a ..
cp -p SDL2-2.0.18/x86_64-w64-mingw32/bin/SDL2.dll .. cp -p SDL2-2.0.20/x86_64-w64-mingw32/bin/SDL2.dll ..
echo -e "\nSetting up FFmpeg" echo -e "\nSetting up FFmpeg"
rm -rf ffmpeg-* rm -rf ffmpeg-*
curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n4.4-latest-win64-gpl-shared-4.4.zip curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip
unzip ffmpeg-n4.4-latest-win64-gpl-shared-4.4.zip unzip ffmpeg-n5.0-latest-win64-gpl-shared-5.0.zip
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/avcodec-58.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/avcodec-59.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/avfilter-7.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/avfilter-8.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/avformat-58.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/avformat-59.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/avutil-56.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/avutil-57.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/postproc-55.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/postproc-56.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/swresample-3.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/swresample-4.dll ..
cp -p ffmpeg-n4.4-latest-win64-gpl-shared-4.4/bin/swscale-5.dll .. cp -p ffmpeg-n5.0-latest-win64-gpl-shared-5.0/bin/swscale-6.dll ..
echo -e "\nSetting up OpenSSL" echo -e "\nSetting up OpenSSL"