SuperTux: updated to master branch

project/jni/application/supertux/.gitignore

@@ -0,0 +1 @@
+/data.zip

project/jni/application/supertux/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="SuperTux"
 AppFullName=org.lethargik.supertux2
 
 # Application version code (integer)
-AppVersionCode=05016
+AppVersionCode=05117
 
 # Application user-visible version name (string)
-AppVersionName="0.5.0.16"
+AppVersionName="0.5.1.17"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
@@ -68,7 +68,7 @@ SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 
 # Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer
-InhibitSuspend=n
+InhibitSuspend=y
 
 # Create Android service, so the app is less likely to be killed while in background
 CreateService=n
@@ -252,24 +252,24 @@ APP_PLATFORM=
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
-MultiABI='armeabi-v7a x86 arm64-v8a'
+MultiABI='armeabi-v7a' # x86 x86_64 arm64-v8a'
 
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 
-CompiledLibraries="sdl_image crypto ssl curl openal vorbis ogg"
+CompiledLibraries="sdl_image boost_filesystem boost_system crypto ssl curl openal vorbis ogg"
 
 # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
 CustomBuildScript=n
 
 # Aditional CFLAGS for application
-AppCflags='-DGL_VERSION_ES_CM_1_0=1 -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -DHAVE_SDL=1' # -flto crashes the linker
+AppCflags='-DSUPERTUX_GLES=1 -Ijni/openal/include/AL -Ijni/boost/include -frtti -fexceptions -DHAVE_SDL=1 -O3' # -flto=thin
 
 # Aditional C++-specific compiler flags for application, added after AppCflags
-AppCppflags='-std=gnu++11'
+AppCppflags='-std=gnu++11 -include limits'
 
 # Additional LDFLAGS for application
-AppLdflags='-frtti -fexceptions' #  -flto -fuse-ld=gold # -flto crashes the linker
+AppLdflags='-frtti -fexceptions -O3' # -flto=thin -flto-jobs=8
 
 # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable
 AppOverlapsSystemHeaders=n

project/jni/application/supertux/AndroidPostBuild.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd supertux/data || exit 1
-#zip -r -n .png:.ogg:.jpg $1 * || exit 1
-zip -r -9 $1 * || exit 1

project/jni/application/supertux/config.h

@@ -31,4 +31,8 @@
 
 #define HAVE_LIBCURL
 
+#define BUILD_DATA_DIR "data"
+
+#define BUILD_CONFIG_DATA_DIR "data"
+
 #endif /*CONFIG_H*/

project/jni/application/supertux/pack-data.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd supertux/data
+zip -9 -r ../../data.zip .

project/jni/application/supertux/upload-data.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+adb shell mkdir -p /sdcard/Android/obb/org.lethargik.supertux2
+adb push data.zip /sdcard/Android/obb/org.lethargik.supertux2/main.5117.org.lethargik.supertux2.obb

project/jni/application/supertux/version.h

@@ -1,4 +1,4 @@
 #ifndef VERSION_H
 #define VERSION_H
-#define PACKAGE_VERSION "v0.5.0"
+#define PACKAGE_VERSION "v0.5.1-517-g7d5b9737d"
 #endif