From 7dae18fa7d1aa279eed1e8e0e9e91c4e3ff65661 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Sun, 9 Jan 2022 21:18:16 +0200 Subject: [PATCH] SuperTux: updated scripts --- project/jni/application/supertux/create-apk-with-data.sh | 4 ++++ project/jni/application/supertux/supertux | 2 +- readme.txt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/project/jni/application/supertux/create-apk-with-data.sh b/project/jni/application/supertux/create-apk-with-data.sh index d43c74b48..43e6a7280 100755 --- a/project/jni/application/supertux/create-apk-with-data.sh +++ b/project/jni/application/supertux/create-apk-with-data.sh @@ -11,6 +11,10 @@ OUT=`pwd`/../../../../SuperTux-with-data.apk DATAZIP=`pwd`/../../../../SuperTux-data.zip rm -f $OUT $OUT-aligned cd supertux/data || exit 1 +if [ -e $HOME/.local/share/supertux2/tilecache ]; then + mkdir -p tilecache + cp -f $HOME/.local/share/supertux2/tilecache/* tilecache/ +fi cp -f ../../../../../../project/app/build/outputs/apk/release/app-release.apk $OUT || exit 1 if zipmerge -h >/dev/null; then [ -e $DATAZIP ] || zip -r -9 $DATAZIP * || exit 1 diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux index 51b2ebaa1..1e6b85548 160000 --- a/project/jni/application/supertux/supertux +++ b/project/jni/application/supertux/supertux @@ -1 +1 @@ -Subproject commit 51b2ebaa1f3cdece3280b1c1e6e2d3850e74e420 +Subproject commit 1e6b85548f443cd986e4a2fb35b143c53f1445d9 diff --git a/readme.txt b/readme.txt index 1a861d083..7decdde14 100644 --- a/readme.txt +++ b/readme.txt @@ -110,7 +110,7 @@ SDL2 will generate additional mouse events for touchscreen and touch events for SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); SDL2 will not terminate the app process and will not unload shared libraries when your main() / SDL_main() function returns, -when the app is launched again your main() will be called again without clearing global and static variables. +when the app is launched again your main() will be called twice without clearing global and static variables. To prevent this, call exit() or _exit() instead of returning from main(). SDL2 by default does not allow internet access in the AndroidManifest.xml, to fix this copy the patch file