From 46e17ced6f64ac79fe192490dbf6f0adeb1bec52 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 15 Dec 2022 20:13:37 +0100 Subject: [PATCH] Updated SDL from 2.24.1 to 2.26.1 --- CMakeLists.txt | 4 ++-- es-app/CMakeLists.txt | 2 +- tools/Windows_dependencies_setup_MSVC.bat | 18 +++++++++--------- tools/Windows_dependencies_setup_MinGW.sh | 12 ++++++------ tools/create_AppImage.sh | 4 ++-- tools/create_AppImage_SteamDeck.sh | 4 ++-- tools/macOS_dependencies_build.sh | 2 +- tools/macOS_dependencies_setup.sh | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75ffc9f82..3a4103d06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -401,7 +401,7 @@ elseif(WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64 ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src - ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.24.1) + ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.26.1) elseif(EMSCRIPTEN) set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include @@ -450,7 +450,7 @@ if(APPLE) ${PROJECT_SOURCE_DIR}/libfreeimage.a ${PROJECT_SOURCE_DIR}/libfreetype.6.dylib ${PROJECT_SOURCE_DIR}/libpugixml.a - ${PROJECT_SOURCE_DIR}/libSDL2-2.0.dylib) + ${PROJECT_SOURCE_DIR}/libSDL2-2.0.0.dylib) elseif(WIN32) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec.lib diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 085391144..5b1274b9a 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -209,7 +209,7 @@ elseif(APPLE) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/libfreetype.6.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) - install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.dylib + install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.0.dylib PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources) diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index 0ebb03b56..3b7ce6342 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -140,26 +140,26 @@ cd .. echo: echo Setting up SDL -if exist SDL2-2.24.1\ ( - rmdir /S /Q SDL2-2.24.1 +if exist SDL2-2.26.1\ ( + rmdir /S /Q SDL2-2.26.1 ) -curl -LO https://libsdl.org/release/SDL2-devel-2.24.1-VC.zip +curl -LO https://libsdl.org/release/SDL2-devel-2.26.1-VC.zip -7z x SDL2-devel-2.24.1-VC.zip +7z x SDL2-devel-2.26.1-VC.zip -if not exist SDL2-2.24.1\ ( +if not exist SDL2-2.26.1\ ( echo SDL directory is missing, aborting. cd .. goto end ) -cd SDL2-2.24.1 +cd SDL2-2.26.1 rename include SDL2 cd .. -copy /Y SDL2-2.24.1\lib\x64\SDL2.dll .. -copy /Y SDL2-2.24.1\lib\x64\SDL2.lib .. -copy /Y SDL2-2.24.1\lib\x64\SDL2main.lib .. +copy /Y SDL2-2.26.1\lib\x64\SDL2.dll .. +copy /Y SDL2-2.26.1\lib\x64\SDL2.lib .. +copy /Y SDL2-2.26.1\lib\x64\SDL2main.lib .. echo: echo Setting up FFmpeg diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index 198073db2..9f5ebbdd9 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -83,20 +83,20 @@ cd .. echo -e "\nSetting up SDL" rm -rf SDL2-* -curl -O https://libsdl.org/release/SDL2-devel-2.24.1-mingw.tar.gz +curl -O https://libsdl.org/release/SDL2-devel-2.26.1-mingw.tar.gz -tar xvzf SDL2-devel-2.24.1-mingw.tar.gz +tar xvzf SDL2-devel-2.26.1-mingw.tar.gz # Needed due to some kind of file system race condition that sometimes occurs on Windows. sleep 1 -if [ ! -d SDL2-2.24.1 ]; then +if [ ! -d SDL2-2.26.1 ]; then echo "SDL directory is missing, aborting." exit fi -mv SDL2-2.24.1/x86_64-w64-mingw32/include/SDL2 SDL2-2.24.1/ -cp -p SDL2-2.24.1/x86_64-w64-mingw32/lib/libSDL2main.a .. -cp -p SDL2-2.24.1/x86_64-w64-mingw32/bin/SDL2.dll .. +mv SDL2-2.26.1/x86_64-w64-mingw32/include/SDL2 SDL2-2.26.1/ +cp -p SDL2-2.26.1/x86_64-w64-mingw32/lib/libSDL2main.a .. +cp -p SDL2-2.26.1/x86_64-w64-mingw32/bin/SDL2.dll .. echo -e "\nSetting up FFmpeg" rm -rf ffmpeg-* diff --git a/tools/create_AppImage.sh b/tools/create_AppImage.sh index 8e60e4466..99da19b6b 100755 --- a/tools/create_AppImage.sh +++ b/tools/create_AppImage.sh @@ -17,8 +17,8 @@ # How many CPU threads to use for the compilation. JOBS=4 -SDL_RELEASE_TAG=release-2.24.1 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2400.1 +SDL_RELEASE_TAG=release-2.26.1 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1 echo "Building AppImage..." diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh index 12d24b575..6dd30e303 100755 --- a/tools/create_AppImage_SteamDeck.sh +++ b/tools/create_AppImage_SteamDeck.sh @@ -13,8 +13,8 @@ # How many CPU threads to use for the compilation. JOBS=4 -SDL_RELEASE_TAG=release-2.24.1 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2400.1 +SDL_RELEASE_TAG=release-2.26.1 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1 echo "Building Steam Deck AppImage..." diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index 789666679..a59d1ce57 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -107,7 +107,7 @@ rm -f CMakeCache.txt cmake -DCMAKE_BUILD_TYPE=Release -S .. -B . make clean make -j${JOBS} -cp libSDL2-2.0.dylib ../../.. +cp libSDL2-2.0.0.dylib ../../.. cd ../.. echo "\nBuilding libvpx" diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index ef358f3f0..c1c432484 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -187,7 +187,7 @@ if [ ! -d SDL ]; then fi cd SDL -git checkout release-2.24.1 +git checkout release-2.26.1 ln -s include SDL2 mkdir build cd ..