From 11090a082e21e03eddaae91d4ff1302de7311c73 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 4 Jul 2018 18:36:44 +0300 Subject: [PATCH] SuperTux: bump version, commandline must contain ./ or gamedata search path won't initialize --- .../jni/application/openlierox/AndroidAppSettings.cfg | 10 +++++----- project/jni/application/openlierox/src | 2 +- project/jni/application/openttd-jgrpp/src | 2 +- .../jni/application/supertux/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/supertux/supertux | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index 7576f768f..dc84890da 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenLieroX" AppFullName=openlierox.net # Application version code (integer) -AppVersionCode=10580422 +AppVersionCode=10580423 # Application user-visible version name (string) -AppVersionName="0.58rc4a22" +AppVersionName="0.58rc4a23" # 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 @@ -275,13 +275,13 @@ CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma mad" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-flto=thin -O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' +AppCflags='-O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' # -flto=thin # Aditional C++-specific compiler flags for application, added after AppCflags -AppCppflags='-flto=thin -O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' +AppCppflags='-O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0' #-flto=thin # Additional LDFLAGS for application -AppLdflags='-flto=thin -flto-jobs=8 -O3' +AppLdflags='-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 diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index 6132fcfc7..09cfe72f5 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit 6132fcfc723b29bdf89e52b3519bc43b18d274dd +Subproject commit 09cfe72f5d66f1e464107c85e6837e577a0f7d07 diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index d696a6204..d3c93ef55 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit d696a620498d52f462c8b916ba77b7b2799e29a2 +Subproject commit d3c93ef55bddc89e6a9bde683dd919738073f67d diff --git a/project/jni/application/supertux/AndroidAppSettings.cfg b/project/jni/application/supertux/AndroidAppSettings.cfg index 39e3e7b8d..8937d8f87 100644 --- a/project/jni/application/supertux/AndroidAppSettings.cfg +++ b/project/jni/application/supertux/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="SuperTux" AppFullName=org.lethargik.supertux2 # Application version code (integer) -AppVersionCode=05119 +AppVersionCode=05120 # Application user-visible version name (string) -AppVersionName="0.5.1.19" +AppVersionName="0.5.1.20" # 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 @@ -21,7 +21,7 @@ AppVersionName="0.5.1.19" AppDataDownloadUrl="!SSL certificates|:ca-certificates.crt:ca-certificates.crt" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag" @@ -296,7 +296,7 @@ AppSubdirsBuild='. supertux/src/* supertux/external/findlocale supertux/external AppBuildExclude='supertux/external/findlocale/example.c supertux/src/video/sdl/sdl_lightmap.cpp supertux/src/video/sdl/sdl_painter.cpp supertux/src/video/sdl/sdl_renderer.cpp supertux/src/video/sdl/sdl_texture.cpp supertux/src/video/sdl/sdl_video_system.cpp supertux/src/control/game_controller_manager.cpp supertux/src/control/joystick_manager.cpp' # Application command line parameters, including app name as 0-th param -AppCmdline='supertux2' +AppCmdline='./supertux2' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux index 9f8a55db9..fe503c557 160000 --- a/project/jni/application/supertux/supertux +++ b/project/jni/application/supertux/supertux @@ -1 +1 @@ -Subproject commit 9f8a55db9a04c4b318053ce3494589e1b06b233d +Subproject commit fe503c5570546f5f993e06c41553f12cfad3a585