From a0ceb71cd94157b4fa3c4cddb7bc3a9a00205021 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sat, 15 Mar 2014 21:07:32 +0200
Subject: [PATCH] OpenTTD: created separate Git repo for Android patches

---
 .gitmodules                                   |  4 ++++
 .../openttd/AndroidAppSettings.cfg            |  2 +-
 .../jni/application/openttd/AndroidBuild.sh   | 23 ++++++++-----------
 project/jni/application/openttd/src           |  1 +
 project/jni/application/xserver-gimp/xserver  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 160000 project/jni/application/openttd/src

diff --git a/.gitmodules b/.gitmodules
index 94c8594b2..8cd5112af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,3 +52,7 @@
 [submodule "project/jni/icuuc/src"]
 	path = project/jni/icuuc/src
 	url = git@github.com:pelya/libiconv-libicu-android.git
+[submodule "project/jni/application/openttd/src"]
+	path = project/jni/application/openttd/src
+	url = git@github.com:pelya/openttd-android.git
+	branch = master
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 4af6c6deb..c8c5e3885 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -201,7 +201,7 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI='all'
+MultiABI='armeabi-v7a'
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=0
diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 6c68fcc14..d0b19aa5b 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -4,21 +4,16 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 VER=1.4.0-beta5
 
-if [ \! -d openttd-$VER-$1 ] ; then
-	[ -e openttd-$VER-source.tar.gz ] || wget http://binaries.openttd.org/releases/$VER/openttd-$VER-source.tar.gz || exit 1
-	tar xvzf openttd-$VER-source.tar.gz
-	cp -a -f openttd-$VER openttd-$VER-orig
-	mv -f openttd-$VER openttd-$VER-$1
-	patch -p 0 -d openttd-$VER-$1 < openttd-trunk-android.patch || exit 1
-fi
+[ -d openttd-$VER-$1 ] || mkdir -p openttd-$VER-$1/bin/baseset
 
-if [ \! -f openttd-$VER-$1/objs/lang/english.lng ] ; then
-	sh -c "cd openttd-$VER-$1 && ./configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --endian=LE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting"
+[ -e openttd-$VER-$1/objs/lang/english.lng -o "$1" '!=' armeabi-v7a ] || {
+	sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --endian=LE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1
 	rm -f openttd-$VER-$1/Makefile
-fi
+} || exit 1
 
 export ARCH=$1
-if [ \! -f openttd-$VER-$1/Makefile ] ; then
-	../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ./configure --host=$2 --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'"
-fi
-../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -lfontconfig -lexpat -licui18n -liculx -licule -licuuc -licudata -lgcc -lz -lc -lgnustl_static -lsupc++'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so
+[ -e openttd-$VER-$1/Makefile ] || {
+	../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --host=$2 --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/$ARCH/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'"
+} || exit 1
+
+../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -lfontconfig -lexpat -licui18n -liculx -licule -licuuc -licudata -lgcc -lz -lc -lgnustl_static -lsupc++'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so || exit 1
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
new file mode 160000
index 000000000..d7b18a8e2
--- /dev/null
+++ b/project/jni/application/openttd/src
@@ -0,0 +1 @@
+Subproject commit d7b18a8e2d5fbd64cea3099a6ea318d0fe1b3493
diff --git a/project/jni/application/xserver-gimp/xserver b/project/jni/application/xserver-gimp/xserver
index db125441a..68765fa3a 160000
--- a/project/jni/application/xserver-gimp/xserver
+++ b/project/jni/application/xserver-gimp/xserver
@@ -1 +1 @@
-Subproject commit db125441ac516c7d5ce9bda6ed2d372c84edbb63
+Subproject commit 68765fa3adc1d6b74b61e5eceb22cf33bc578681