From 1888ec55f5ebe2d53d46e7172df0657aad1e8718 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 25 Jun 2023 13:18:43 +0200 Subject: [PATCH] Updated SDL to 2.28.0 on Windows, macOS and the Linux AppImage builds --- tools/Windows_dependencies_setup_MSVC.bat | 12 ++++++------ 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, 15 insertions(+), 15 deletions(-) diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index fd06cbb0e..28e719be5 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -214,25 +214,25 @@ cd .. echo: echo Setting up SDL -if exist SDL2-2.26.5\ ( - rmdir /S /Q SDL2-2.26.5 +if exist SDL2-2.28.0\ ( + rmdir /S /Q SDL2-2.28.0 ) if exist SDL2\ ( rmdir /S /Q SDL2 ) -curl -LO https://libsdl.org/release/SDL2-devel-2.26.5-VC.zip +curl -LO https://libsdl.org/release/SDL2-devel-2.28.0-VC.zip -7z x SDL2-devel-2.26.5-VC.zip +7z x SDL2-devel-2.28.0-VC.zip -if not exist SDL2-2.26.5\ ( +if not exist SDL2-2.28.0\ ( echo SDL directory is missing, aborting. cd .. goto end ) -rename SDL2-2.26.5 SDL2 +rename SDL2-2.28.0 SDL2 cd SDL2 rename include SDL2 diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index fab8b8724..e0110ae5f 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -120,18 +120,18 @@ cd .. echo -e "\nSetting up SDL" rm -rf SDL2* -curl -O https://libsdl.org/release/SDL2-devel-2.26.5-mingw.tar.gz +curl -O https://libsdl.org/release/SDL2-devel-2.28.0-mingw.tar.gz -tar xvzf SDL2-devel-2.26.5-mingw.tar.gz +tar xvzf SDL2-devel-2.28.0-mingw.tar.gz # Needed due to some kind of file system race condition that sometimes occurs on Windows. sleep 1 -if [ ! -d SDL2-2.26.5 ]; then +if [ ! -d SDL2-2.28.0 ]; then echo "SDL directory is missing, aborting." exit fi -mv SDL2-2.26.5 SDL2 +mv SDL2-2.28.0 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 ae0e58145..d09aaddce 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.26.5 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.5 +SDL_RELEASE_TAG=release-2.28.0 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.0 echo "Building AppImage..." diff --git a/tools/create_AppImage_SteamDeck.sh b/tools/create_AppImage_SteamDeck.sh index 9af3555e1..aaaeba37a 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.26.5 -SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.5 +SDL_RELEASE_TAG=release-2.28.0 +SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2800.0 echo "Building Steam Deck AppImage..." diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index 85f4d8b5a..f11552718 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.26.5 +git checkout release-2.28.0 ln -s include SDL2 mkdir build cd ..