From 8c34faa475f004c6fd6152dd306cbe255a51e8fc Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Fri, 26 Apr 2019 22:54:54 +0300
Subject: [PATCH] OpenTTD: updated build scripts

---
 .../application/openttd/AndroidAppSettings.cfg  |  2 +-
 project/jni/application/openttd/AndroidBuild.sh | 17 ++++++++++-------
 project/jni/application/openttd/build-pc.sh     |  4 ++--
 project/jni/application/openttd/src             |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 56602a6cd..09e238b55 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -244,7 +244,7 @@ NDK_TOOLCHAIN_VERSION=clang
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi-v7a x86 arm64-v8a x86_64
-MultiABI='arm64-v8a' # armeabi-v7a  x86 x86_64
+MultiABI='arm64-v8a armeabi-v7a  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/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 823e69414..d3c6acecd 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -17,21 +17,24 @@ CPU_TYPE=32
 	cp -a src/bin/baseset openttd-$VER-$1/bin/
 } || exit 1
 
-[ -e openttd-$VER-$1/objs/lang/english.lng ] || {
-	sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib \
-			--without-lzo2 --without-lzma --cpu-type=$CPU_TYPE && \
-			make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1
-	rm -f openttd-$VER-$1/Makefile
-} || exit 1
+#[ -e openttd-$VER-$1/objs/lang/english.lng ] || {
+#	sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib \
+#			--without-lzo2 --without-lzma --cpu-type=$CPU_TYPE && \
+#			make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1
+#	rm -f openttd-$VER-$1/Makefile
+#} || exit 1
 
 [ -e openttd-$VER-$1/Makefile ] || {
 	rm -f src/src/rev.cpp
 	env PATH=$LOCAL_PATH/..:$PATH \
 	env LDFLAGS=-L$LOCAL_PATH/../../../obj/local/$ARCH \
+	env CFLAGS_BUILD="-I." \
+	env CXXFLAGS_BUILD="-I." \
+	env LDFLAGS_BUILD="-L." \
 	env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure \
 		--with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity='pkg-config libtimidity' \
 		--with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' \
-		--without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE --os=android"
+		--without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE --os=android --cc-build=gcc --cxx-build=g++"
 } || exit 1
 
 NCPU=4
diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh
index abc78360e..a091bd9b5 100755
--- a/project/jni/application/openttd/build-pc.sh
+++ b/project/jni/application/openttd/build-pc.sh
@@ -18,9 +18,9 @@ cd bin
 export LD_LIBRARY_PATH=/usr/local/lib
 
 if [ -z "$1" ]; then
-	./openttd -d 2 -r 854x480 -g opntitle.sav
+	./openttd -d 2 -g opntitle.sav
 else
 	#valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \
 	gdb -ex run --args \
-	./openttd -d 2 -r 854x480 -g opntitle.sav
+	./openttd -d 2 -g opntitle.sav
 fi
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index c1febca55..5c5eebcd5 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit c1febca55fcbb91ecb5b13d71e62ba9bc896d913
+Subproject commit 5c5eebcd5c234ee98db20f0fb75ae65452ca63dc