diff --git a/3rdParty/SDL2/CMakeLists.txt b/3rdParty/SDL2/CMakeLists.txt index e7fbfddf9..e3806be99 100644 --- a/3rdParty/SDL2/CMakeLists.txt +++ b/3rdParty/SDL2/CMakeLists.txt @@ -14,8 +14,8 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF) include(functions/FetchContent_ExcludeFromAll_backport) include(FetchContent) -FetchContent_Declare_ExcludeFromAll(SDL2 - URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.10/SDL2-2.30.10.tar.gz - URL_HASH SHA256=f59adf36a0fcf4c94198e7d3d776c1b3824211ab7aeebeb31fe19836661196aa +FetchContent_Declare(SDL2 + URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-2.30.12.tar.gz + URL_HASH SHA256=ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea ) FetchContent_MakeAvailable_ExcludeFromAll(SDL2) diff --git a/Packaging/windows/mingw-prep.sh b/Packaging/windows/mingw-prep.sh index 2583c602d..b9b84b907 100755 --- a/Packaging/windows/mingw-prep.sh +++ b/Packaging/windows/mingw-prep.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SDLDEV_VERS=2.30.10 +SDLDEV_VERS=2.30.12 SODIUM_VERS=1.0.20 # exit when any command fails diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index d8e403f5e..2d34e54ef 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh private static final String TAG = "SDL"; private static final int SDL_MAJOR_VERSION = 2; private static final int SDL_MINOR_VERSION = 30; - private static final int SDL_MICRO_VERSION = 10; + private static final int SDL_MICRO_VERSION = 12; /* // Display InputType.SOURCE/CLASS of events and devices // @@ -311,7 +311,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh mNextNativeState = NativeState.INIT; mCurrentNativeState = NativeState.INIT; } - + protected SDLSurface createSDLSurface(Context context) { return new SDLSurface(context); } diff --git a/tools/update_sdl_android_project.sh b/tools/update_sdl_android_project.sh index e031e0223..472f6ad1c 100755 --- a/tools/update_sdl_android_project.sh +++ b/tools/update_sdl_android_project.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.10 +SDL_BASE=https://raw.githubusercontent.com/libsdl-org/SDL/release-2.30.12 FILES=( HIDDevice.java HIDDeviceBLESteamController.java