diff --git a/project/jni/application/openlierox/AndroidAppSettings.cfg b/project/jni/application/openlierox/AndroidAppSettings.cfg index f07eaa9de..42ea823ae 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=10580316 +AppVersionCode=10580318 # Application user-visible version name (string) -AppVersionName="0.58rc3a16" +AppVersionName="0.58rc3a18" # 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 diff --git a/project/jni/application/openlierox/AndroidBuild.sh b/project/jni/application/openlierox/AndroidBuild.sh deleted file mode 100755 index 0a5fcd4a4..000000000 --- a/project/jni/application/openlierox/AndroidBuild.sh +++ /dev/null @@ -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 diff --git a/project/jni/application/openlierox/src b/project/jni/application/openlierox/src index f4a0d3d02..f38d4cddb 160000 --- a/project/jni/application/openlierox/src +++ b/project/jni/application/openlierox/src @@ -1 +1 @@ -Subproject commit f4a0d3d02e6b0dd6444ec03382163cc7df855845 +Subproject commit f38d4cddb2c5333720beab90ec83f7a493e94d25