From 6369370f82bf665e643b49262e56e272a2c29e52 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 13 Feb 2024 17:07:58 +0100 Subject: [PATCH] Updated SDL to 2.30.0 on Windows, macOS and the Linux AppImage builds --- tools/Windows_dependencies_setup.bat | 16 ++++++++-------- tools/create_AppImage.sh | 4 ++-- tools/create_AppImage_SteamDeck.sh | 4 ++-- tools/macOS_dependencies_setup.sh | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/Windows_dependencies_setup.bat b/tools/Windows_dependencies_setup.bat index 179e70d0b..d20741d29 100644 --- a/tools/Windows_dependencies_setup.bat +++ b/tools/Windows_dependencies_setup.bat @@ -230,29 +230,29 @@ cd .. echo: echo Setting up SDL -if exist SDL2-2.28.5\ ( - rmdir /S /Q SDL2-2.28.5 +if exist SDL2-2.30.0\ ( + rmdir /S /Q SDL2-2.30.0 ) if exist SDL2\ ( rmdir /S /Q SDL2 ) -if exist SDL2-devel-2.28.5-VC.zip ( - del SDL2-devel-2.28.5-VC.zip +if exist SDL2-devel-2.30.0-VC.zip ( + del SDL2-devel-2.30.0-VC.zip ) -curl -LO https://libsdl.org/release/SDL2-devel-2.28.5-VC.zip +curl -LO https://libsdl.org/release/SDL2-devel-2.30.0-VC.zip -7z x SDL2-devel-2.28.5-VC.zip +7z x SDL2-devel-2.30.0-VC.zip -if not exist SDL2-2.28.5\ ( +if not exist SDL2-2.30.0\ ( echo SDL directory is missing, aborting. cd .. goto end ) -rename SDL2-2.28.5 SDL2 +rename SDL2-2.30.0 SDL2 cd SDL2 rename include SDL2 diff --git a/tools/create_AppImage.sh b/tools/create_AppImage.sh index db6d45243..c29c077d4 100755 --- a/tools/create_AppImage.sh +++ b/tools/create_AppImage.sh @@ -13,8 +13,8 @@ # How many CPU threads to use for the compilation. JOBS=4 -SDL_RELEASE_TAG=release-2.28.5 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.5 +SDL_RELEASE_TAG=release-2.30.0 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.3000.0 echo "Building AppImage..." diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh index 9bc4422b1..6c9ea8c73 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.28.5 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.5 +SDL_RELEASE_TAG=release-2.30.0 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.3000.0 echo "Building Steam Deck AppImage..." diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index 40de54f97..9ff818aba 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -280,7 +280,7 @@ if [ ! -d SDL ]; then fi cd SDL -git checkout release-2.28.5 +git checkout release-2.30.0 ln -s include SDL2 mkdir build cd ..