Merge branch 'sdl_android' of github.com:pelya/commandergenius

project/jni/application/openlierox/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="OpenLieroX"
 AppFullName=openlierox.net
 
 # Application version code (integer)
-AppVersionCode=10580316
+AppVersionCode=10580418
 
 # Application user-visible version name (string)
-AppVersionName="0.58rc3a16"
+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

project/jni/application/openlierox/AndroidBuild.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-LOCAL_PATH=`dirname $0`
-LOCAL_PATH=`cd $LOCAL_PATH && pwd`
-
-NDK_PATH=`which ndk-build | sed 's@/ndk-build@@'`
-
-cd src
-mkdir -p out-$1
-cd out-$1
-
-cmake .. \
--DCMAKE_TOOLCHAIN_FILE=$NDK_PATH/build/cmake/android.toolchain.cmake -DANDROID_ABI=$1 \
--DX11=No -DLIBZIP_BUILTIN=Yes -DDEBUG=No -DHASBFD=No -DDISABLE_JOYSTICK=Yes \
- || exit 1
-
-NCPU=4
-uname -s | grep -i "linux" > /dev/null && NCPU=`cat /proc/cpuinfo | grep -c -i processor`
-
-make -j$NCPU || exit 1
-
-cp -f bin/openlierox ../../libapplication-$1.so || exit 1

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

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 )