1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-22 08:49:46 +01:00

update android sdl2 to 2.30.8

This commit is contained in:
leo60228 2024-10-05 16:33:24 -04:00 committed by Ethan Lee
parent c2642dbdef
commit 4587fa46b0
3 changed files with 8 additions and 8 deletions

View file

@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
repository: libsdl-org/SDL repository: libsdl-org/SDL
ref: release-2.28.5 ref: release-2.30.8
path: 'SDL' path: 'SDL'
- name: Build SDL - name: Build SDL
@ -73,7 +73,7 @@ jobs:
sudo apt-get -y install ninja-build sudo apt-get -y install ninja-build
cd SDL cd SDL
./build-scripts/android-prefab.sh ./build-scripts/android-prefab.sh
mvn install:install-file -Dfile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.aar -DpomFile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.pom mvn install:install-file -Dfile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.aar -DpomFile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.pom
- name: Build - name: Build
run: | run: |

View file

@ -10,18 +10,18 @@ How to Build
------------ ------------
The recommended way is to install Android Studio and Maven. These instructions are for The recommended way is to install Android Studio and Maven. These instructions are for
SDL 2.28.5; adapt your SDL version accordingly. SDL 2.30.8; adapt your SDL version accordingly.
1. Place a copy of `data.zip` in `desktop_version/VVVVVV-android/app/src/main/assets/`. 1. Place a copy of `data.zip` in `desktop_version/VVVVVV-android/app/src/main/assets/`.
(If the `assets/` folder doesn't exist, then create it.) (If the `assets/` folder doesn't exist, then create it.)
2. Obtain the SDL 2.28.5 Maven package. As of writing, SDL currently does not publish 2. Obtain the SDL 2.30.8 Maven package. As of writing, SDL currently does not publish
Maven packages, so here is one way to obtain them (other methods are possible): Maven packages, so here is one way to obtain them (other methods are possible):
1. Download the SDL 2.28.5 source code. 1. Download the SDL 2.30.8 source code.
2. Run the `build-scripts/android-prefab.sh` script in the SDL repository. 2. Run the `build-scripts/android-prefab.sh` script in the SDL repository.
3. After building, run `mvn install:install-file 3. After building, run `mvn install:install-file
-Dfile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.aar -Dfile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.aar
-DpomFile=build-android-prefab/prefab-2.28.5/SDL2-2.28.5.pom` to install it to -DpomFile=build-android-prefab/prefab-2.30.8/SDL2-2.30.8.pom` to install it to
Maven Local. Maven Local.
3. Open the `desktop_version/VVVVVV-android/` folder in Android Studio. 3. Open the `desktop_version/VVVVVV-android/` folder in Android Studio.

View file

@ -110,5 +110,5 @@ dependencies {
implementation 'org.jetbrains:annotations:15.0' implementation 'org.jetbrains:annotations:15.0'
implementation 'androidx.core:core:1.10.1' implementation 'androidx.core:core:1.10.1'
implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.exifinterface:exifinterface:1.3.6'
implementation 'org.libsdl.android:SDL2:2.28.5' implementation 'org.libsdl.android:SDL2:2.30.8'
} }