From e4d00b62024649494834dac77d9411d17dbc83c8 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 25 Feb 2018 22:52:57 +0200
Subject: [PATCH] OpenLieroX: bump version

---
 .../application/openlierox/AndroidAppSettings.cfg  |   6 +++---
 .../jni/application/openlierox/AndroidPreBuild.sh  |   3 ++-
 project/jni/application/openlierox/java.patch      |  13 +++++++++++++
 .../application/openlierox/{keen.raw => liero.raw} | Bin
 project/jni/application/openlierox/src             |   2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 project/jni/application/openlierox/java.patch
 rename project/jni/application/openlierox/{keen.raw => liero.raw} (100%)

diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg
index 42ea823ae..f6896458e 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=10580318
+AppVersionCode=10580418
 
 # Application user-visible version name (string)
-AppVersionName="0.58rc3a18"
+AppVersionName="0.58rc4a18"
 
 # 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
@@ -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 x86 x86_64' # arm64-v8a x86 x86_64
+MultiABI='armeabi-v7a' # arm64-v8a x86 x86_64
 
 # 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
diff --git a/project/jni/application/openlierox/AndroidPreBuild.sh b/project/jni/application/openlierox/AndroidPreBuild.sh
index 982b00a9c..3fe5ca464 100755
--- a/project/jni/application/openlierox/AndroidPreBuild.sh
+++ b/project/jni/application/openlierox/AndroidPreBuild.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cp -f keen.raw ../../../res/raw/
+cp -f liero.raw ../../../res/raw/
 
 [ -e AndroidData/data.zip.xz ] && exit 0
 cd src/share/gamedir
@@ -8,3 +8,4 @@ rm -f ../data.zip
 zip -0 -r ../data.zip .
 cd ../../..
 xz -9 < src/share/data.zip > AndroidData/data.zip.xz
+rm -f src/share/data.zip
diff --git a/project/jni/application/openlierox/java.patch b/project/jni/application/openlierox/java.patch
new file mode 100644
index 000000000..e96557e16
--- /dev/null
+++ b/project/jni/application/openlierox/java.patch
@@ -0,0 +1,13 @@
+diff --git a/project/java/Settings.java b/project/java/Settings.java
+index 9e6150a..09ade66 100644
+--- a/project/java/Settings.java
++++ b/project/java/Settings.java
+@@ -736,7 +736,7 @@ public class Settings
+ 			if( Globals.TouchscreenKeyboardTheme == 2 )
+ 				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.sun));
+ 			if( Globals.TouchscreenKeyboardTheme == 3 )
+-				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.keen));
++				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.liero));
+ 			if( Globals.TouchscreenKeyboardTheme == 4 )
+ 				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.retro));
+ 			if( Globals.TouchscreenKeyboardTheme == 5 )
diff --git a/project/jni/application/openlierox/keen.raw b/project/jni/application/openlierox/liero.raw
similarity index 100%
rename from project/jni/application/openlierox/keen.raw
rename to project/jni/application/openlierox/liero.raw
diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src
index f38d4cddb..b0941a22c 160000
--- a/project/jni/application/openlierox/src
+++ b/project/jni/application/openlierox/src
@@ -1 +1 @@
-Subproject commit f38d4cddb2c5333720beab90ec83f7a493e94d25
+Subproject commit b0941a22c239b52073ee5c9ee34e730280baa117