Browse Source

Upgrade SDL2 to 2.23.4

Upgrade includes build-from source, Android and VCPKG
pull/7903/head
Oleksandr Kalko 12 months ago committed by Anders Jenbo
parent
commit
3d7a8e8f48
  1. 2
      .github/workflows/Windows_MSVC_x64.yml
  2. 4
      3rdParty/SDL2/CMakeLists.txt
  3. 2
      android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
  4. 2
      vcpkg.json

2
.github/workflows/Windows_MSVC_x64.yml

@ -42,7 +42,7 @@ jobs:
- name: Restore or setup vcpkg - name: Restore or setup vcpkg
uses: lukka/run-vcpkg@v11.5 uses: lukka/run-vcpkg@v11.5
with: with:
vcpkgGitCommitId: 'acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4' vcpkgGitCommitId: '533a5fda5c0646d1771345fb572e759283444d5f'
- name: Fetch test data - name: Fetch test data
run: | run: |

4
3rdParty/SDL2/CMakeLists.txt vendored

@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
include(functions/FetchContent_ExcludeFromAll_backport) include(functions/FetchContent_ExcludeFromAll_backport)
include(FetchContent) include(FetchContent)
FetchContent_Declare(SDL2 FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.2/SDL2-2.32.2.tar.gz URL https://github.com/libsdl-org/SDL/releases/download/release-2.32.4/SDL2-2.32.4.tar.gz
URL_HASH SHA256=c5f30c427fd8107ee4a400c84d4447dd211352512eaf0b6e89cc6a50a2821922 URL_HASH SHA256=f15b478253e1ff6dac62257ded225ff4e7d0c5230204ac3450f1144ee806f934
) )
FetchContent_MakeAvailable_ExcludeFromAll(SDL2) FetchContent_MakeAvailable_ExcludeFromAll(SDL2)

2
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 String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2; private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 32; private static final int SDL_MINOR_VERSION = 32;
private static final int SDL_MICRO_VERSION = 2; private static final int SDL_MICRO_VERSION = 4;
/* /*
// Display InputType.SOURCE/CLASS of events and devices // Display InputType.SOURCE/CLASS of events and devices
// //

2
vcpkg.json

@ -6,7 +6,7 @@
"bzip2", "bzip2",
"lua" "lua"
], ],
"builtin-baseline": "acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4", "builtin-baseline": "533a5fda5c0646d1771345fb572e759283444d5f",
"features": { "features": {
"sdl1": { "sdl1": {
"description": "Use SDL1.2 instead of SDL2", "description": "Use SDL1.2 instead of SDL2",

Loading…
Cancel
Save