diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index 33e934fa6..38e07d1c1 100644 --- a/project/jni/application/openlierox/AndroidAppSettings.cfg +++ b/project/jni/application/openlierox/AndroidAppSettings.cfg @@ -21,10 +21,10 @@ AppVersionName="0.59b10a03" AppDataDownloadUrl="!!Game data|data.zip.xz" # 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" +DeleteFilesOnUpgrade="" #"libsdl-DownloadFinished-0.flag" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ @@ -203,13 +203,13 @@ NonBlockingSwapBuffers=n RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP" # Number of virtual keyboard keys (currently 6 is maximum) -AppTouchscreenKeyboardKeysAmount=5 +AppTouchscreenKeyboardKeysAmount=4 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="LALT X LCTRL Z LSHIFT" +RedefinedKeysScreenKb="LALT X LCTRL LSHIFT I" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu -RedefinedKeysScreenKbNames="Jump Rope Shoot Strafe SelectWeapon" +RedefinedKeysScreenKbNames="Jump Rope Shoot SelectWeapon Chat" # On-screen keys theme # 0 = Ultimate Droid by Sean Stieber (green, with cross joystick) @@ -264,7 +264,7 @@ APP_PLATFORM=android-21 # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a -MultiABI='armeabi-v7a arm64-v8a' +MultiABI='armeabi-v7a' # arm64-v8a x86 #MultiABI='x86' # Optional shared libraries to compile - removing some of them will save space @@ -282,7 +282,7 @@ AppCflags='-flto=thin -O3 -ffast-math -Werror=format -DDISABLE_JOYSTICK -DHAVE_L AppCppflags='-flto=thin -O3 -ffast-math -Werror=format -std=c++11 -frtti -fexceptions -DDISABLE_JOYSTICK -DHAVE_LINENOISE -DNBREAKPAD -DHAVE_EXECINFO=0 -DSINGLETHREADED=1' # Additional LDFLAGS for application -AppLdflags='-flto=thin -flto-jobs=4 -O3' +AppLdflags='-flto=thin -flto-jobs=8 -O3' # 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 16c4f2339..10b3bbb09 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit 16c4f2339053d4ac1f936d8e1ee206f5b2b0857f +Subproject commit 10b3bbb09e39b0b5f45e7c039027cb39d8cc3390 diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 555ab979b..46cc53c3f 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 555ab979bc606f5f72592ccdd63a83311cfd2e7f +Subproject commit 46cc53c3fe3e9d878eb9076911f60c9ea77e0abc diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index d7de3b0db..bbeaad03e 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit d7de3b0dbeb10de70f841653f2a875350fe36870 +Subproject commit bbeaad03e4b470d0f114b252374c82942a1f1d07