From ce18f24521e28be011823c580527b6fdce45b6bf Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 9 Sep 2023 10:27:23 +0200 Subject: [PATCH] Updated SDL to 2.28.3 on Windows, macOS and the Linux AppImage builds --- tools/Windows_dependencies_setup_MSVC.bat | 16 ++++++++-------- tools/Windows_dependencies_setup_MinGW.sh | 8 ++++---- tools/create_AppImage.sh | 4 ++-- tools/create_AppImage_SteamDeck.sh | 4 ++-- tools/macOS_dependencies_setup.sh | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index 4cad5c8ad..b9e5aeda2 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -230,29 +230,29 @@ cd .. echo: echo Setting up SDL -if exist SDL2-2.28.1\ ( - rmdir /S /Q SDL2-2.28.1 +if exist SDL2-2.28.3\ ( + rmdir /S /Q SDL2-2.28.3 ) if exist SDL2\ ( rmdir /S /Q SDL2 ) -if exist SDL2-devel-2.28.1-VC.zip ( - del SDL2-devel-2.28.1-VC.zip +if exist SDL2-devel-2.28.3-VC.zip ( + del SDL2-devel-2.28.3-VC.zip ) -curl -LO https://libsdl.org/release/SDL2-devel-2.28.1-VC.zip +curl -LO https://libsdl.org/release/SDL2-devel-2.28.3-VC.zip -7z x SDL2-devel-2.28.1-VC.zip +7z x SDL2-devel-2.28.3-VC.zip -if not exist SDL2-2.28.1\ ( +if not exist SDL2-2.28.3\ ( echo SDL directory is missing, aborting. cd .. goto end ) -rename SDL2-2.28.1 SDL2 +rename SDL2-2.28.3 SDL2 cd SDL2 rename include SDL2 diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index a20e7d73a..e6663d60b 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -125,18 +125,18 @@ cd .. echo -e "\nSetting up SDL" rm -rf SDL2* -curl -O https://libsdl.org/release/SDL2-devel-2.28.1-mingw.tar.gz +curl -O https://libsdl.org/release/SDL2-devel-2.28.3-mingw.tar.gz -tar xvzf SDL2-devel-2.28.1-mingw.tar.gz +tar xvzf SDL2-devel-2.28.3-mingw.tar.gz -if [ ! -d SDL2-2.28.1 ]; then +if [ ! -d SDL2-2.28.3 ]; then echo "SDL directory is missing, aborting." exit fi sleep 3 -mv SDL2-2.28.1 SDL2 +mv SDL2-2.28.3 SDL2 mv SDL2/x86_64-w64-mingw32/include/SDL2 SDL2/ cp -p SDL2/x86_64-w64-mingw32/lib/libSDL2main.a .. diff --git a/tools/create_AppImage.sh b/tools/create_AppImage.sh index b9f7500ca..d5c7c33b6 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.28.1 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.1 +SDL_RELEASE_TAG=release-2.28.3 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.3 echo "Building AppImage..." diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh index 86f5d93a9..2fcd2d782 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.1 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.1 +SDL_RELEASE_TAG=release-2.28.3 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.3 echo "Building Steam Deck AppImage..." diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index 56f46dfdb..7296547af 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.1 +git checkout release-2.28.3 ln -s include SDL2 mkdir build cd ..