Skip to content

Commit

Permalink
Update to SDL3 and target Android 15.
Browse files Browse the repository at this point in the history
Currently game selection (the "LOVE Loader") equivalent is currently broken, but it will be addressed in future cleanup.
  • Loading branch information
MikuAuahDark committed Oct 13, 2024
1 parent e8e3eb3 commit f585f05
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ android {
versionCode project.properties["app.version_code"].toInteger()
versionName project.properties["app.version_name"]
minSdk 23
compileSdk 34
targetSdk 34
compileSdk 35
targetSdk 35

externalNativeBuild {
cmake {
arguments "-DANDROID_STL=c++_shared"
arguments "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=1"
// https://issuetracker.google.com/issues/274493986
// Transitive shared library that's added through `add_dependencies` is not taken into
// account. This result in liboboe.so and libluajit.so not get included into the final
Expand Down Expand Up @@ -124,7 +124,7 @@ android {
sourceSets {
main {
java {
srcDir 'src/main/cpp/megasource/libs/SDL2/android-project/app/src/main/java'
srcDir 'src/main/cpp/megasource/libs/SDL3/android-project/app/src/main/java'
srcDir 'src/main/java'
srcDir 'src/main/cpp/love/src/libraries/luahttps/src/android/java'
srcDirs += retrieveAll3pModules()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/love2d/android/GameActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected String getMainSharedObject() {
protected String[] getLibraries() {
return new String[]{
"c++_shared",
"SDL2",
"SDL3",
"oboe",
"openal",
"luajit",
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ app.version_name=12.0
# No need to modify anything past this line!
android.enableJetifier=false
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=true
android.nonFinalResIds=true

0 comments on commit f585f05

Please sign in to comment.