From 609e9f9bb5875f24c200e0377a89b956ad81a42b Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 1 Oct 2012 19:01:00 +0300
Subject: [PATCH] Fixed OpenArena compilation

---
 .../jni/application/openarena/AndroidBuild.sh |  15 ++++++++-------
 .../application/openarena/AndroidData/vm.zip  | Bin 447545 -> 447545 bytes
 project/jni/application/openarena/readme.txt  |   1 +
 .../openttd/AndroidAppSettings.cfg            |   6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index a068628c1..877d55ade 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -3,13 +3,6 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
-../setEnvironment-$1.sh make -j8 -C engine release \
-PLATFORM=android ARCH=$1 USE_GLES=1 USE_LOCAL_HEADERS=0 \
-USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=1 USE_MUMBLE=0 USE_FREETYPE=1 \
-USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 && \
-echo "Copying engine/build/release-android-$1/openarena.$1 -> libapplication-$1.so" && \
-cp -f engine/build/release-android-$1/openarena.$1 libapplication-$1.so
-
 [ "$1" = "armeabi" ] && (
 [ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
 make -j8 -C vm
@@ -17,3 +10,11 @@ cd vm/build/release-*/baseq3
 zip -r vm.zip vm
 cmp -s vm.zip ../../../../AndroidData/vm.zip || mv -f vm.zip ../../../../AndroidData/vm.zip
 )
+
+../setEnvironment-$1.sh make -j8 -C engine release \
+PLATFORM=android ARCH=$1 USE_GLES=1 USE_LOCAL_HEADERS=0 \
+USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=1 USE_MUMBLE=0 USE_FREETYPE=1 \
+USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 && \
+echo "Copying engine/build/release-android-$1/openarena.$1 -> libapplication-$1.so" && \
+cp -f engine/build/release-android-$1/openarena.$1 libapplication-$1.so && \
+exit 0
diff --git a/project/jni/application/openarena/AndroidData/vm.zip b/project/jni/application/openarena/AndroidData/vm.zip
index dba64ab657ff5b5d7b4c23fd5bbc428bf14ce61c..58512bdb8d9c45b0ad3e10c3337708c68df2e6ad 100644
GIT binary patch
delta 62
zcmdnFLVD*4=?PlQd0R6l>N+qVXisS@*jm8Yw+_T?XI#&?opC*r^jk1behzcH{2Z2c
O`8llH<>#<TSpWbf))(Rc

delta 65
zcmdnFLVD*4=?PklbEgYlVH25Xug5&+L1JUU)&j=9bs%Ot<9f#JjO&@C--3DabC}!Z
R=diTP&tcszKZi}q0sv}_865xs

diff --git a/project/jni/application/openarena/readme.txt b/project/jni/application/openarena/readme.txt
index 84ae29368..a82c0a67c 100644
--- a/project/jni/application/openarena/readme.txt
+++ b/project/jni/application/openarena/readme.txt
@@ -3,6 +3,7 @@ Download SDL Git repo from https://github.com/pelya/commandergenius,
 install latest Android SDK, Android NDK r8b or newer, and "ant" tool (sudo apt-get install ant),
 then launch commands:
     git submodule update --init project/jni/application/openarena/engine
+    git submodule update --init project/jni/application/openarena/vm
     rm project/jni/application/src # ignore the error
     ln -s openarena project/jni/application/src
     ./ChangeAppSettings.sh -a
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 7f206d5a5..a242a196b 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -34,9 +34,9 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=12221
-AppVersionName="1.2.2.21"
-ResetSdlConfigForThisVersion=y
+AppVersionCode=12222
+AppVersionName="1.2.2.22"
+ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade=".openttd/openttd.cfg"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"
 CustomBuildScript=y