Browse Source

Upgrade SDL to 2.30.0

pull/6924/head
Anders Jenbo 2 years ago
parent
commit
522b5e8472
  1. 4
      3rdParty/SDL2/CMakeLists.txt
  2. 1
      android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
  3. 4
      android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
  4. 6
      android-project/build.gradle

4
3rdParty/SDL2/CMakeLists.txt vendored

@ -15,7 +15,7 @@ set(SDL_TEST_ENABLED_BY_DEFAULT OFF)
include(functions/FetchContent_MakeAvailableExcludeFromAll)
include(FetchContent)
FetchContent_Declare(SDL2
URL https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5.tar.gz
URL_HASH SHA256=332cb37d0be20cb9541739c61f79bae5a477427d79ae85e352089afdaf6666e4
URL https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
URL_HASH SHA256=36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0
)
FetchContent_MakeAvailableExcludeFromAll(SDL2)

1
android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java

@ -285,6 +285,7 @@ public class HIDDeviceManager {
0x24c6, // PowerA
0x2dc8, // 8BitDo
0x2e24, // Hyperkin
0x3537, // GameSir
};
if (usbInterface.getId() == 0 &&

4
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@ -60,8 +60,8 @@ import java.util.Locale;
public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
private static final String TAG = "SDL";
private static final int SDL_MAJOR_VERSION = 2;
private static final int SDL_MINOR_VERSION = 28;
private static final int SDL_MICRO_VERSION = 5;
private static final int SDL_MINOR_VERSION = 30;
private static final int SDL_MICRO_VERSION = 0;
/*
// Display InputType.SOURCE/CLASS of events and devices
//

6
android-project/build.gradle

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.0'
classpath 'com.android.tools.build:gradle:8.2.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -20,6 +20,6 @@ allprojects {
}
}
tasks.register('clean', Delete) {
delete rootProject.buildDir
task clean(type: Delete) {
delete rootProject.buildDir
}

Loading…
Cancel
Save