From 9aa0a1ae36c5a0fbc917eb52adfa988401f5749c Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sun, 19 Feb 2017 23:46:43 +0200
Subject: [PATCH] Updated submodules, fixed OpenTTD compilation

---
 project/jni/application/commandergenius/commandergenius | 2 +-
 project/jni/application/ninslash/AndroidAppSettings.cfg | 4 ++--
 project/jni/application/ninslash/src                    | 2 +-
 project/jni/application/openttd/AndroidBuild.sh         | 2 +-
 project/jni/application/openttd/src                     | 2 +-
 project/jni/application/vice/vice                       | 2 +-
 project/jni/boost/src                                   | 2 +-
 project/jni/shmem                                       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index fcb5e9f3d..ee839fb2d 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit fcb5e9f3d832d2e70f36a6a1907721f5dc1d2cba
+Subproject commit ee839fb2d3dc67f271349371fcc4b38c2bf46188
diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg
index f388eb328..66ce55e79 100644
--- a/project/jni/application/ninslash/AndroidAppSettings.cfg
+++ b/project/jni/application/ninslash/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="Ninslash"
 AppFullName=ninslash.com
 
 # Application version code (integer)
-AppVersionCode=02117
+AppVersionCode=02118
 
 # Application user-visible version name (string)
-AppVersionName="0.2.1.17"
+AppVersionName="0.2.1.18"
 
 # 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/ninslash/src b/project/jni/application/ninslash/src
index 9b2cee79d..2ad9a7fd1 160000
--- a/project/jni/application/ninslash/src
+++ b/project/jni/application/ninslash/src
@@ -1 +1 @@
-Subproject commit 9b2cee79d1e00fb3a19953c43b2e8a1e55538d63
+Subproject commit 2ad9a7fd1ebfe748ecb528dabad52ad6de61e9b3
diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index 7fff92219..f08044bbb 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -15,7 +15,7 @@ export ARCH=$1
 [ -e openttd-$VER-$1/Makefile ] || {
 	rm -f src/src/rev.cpp
 	env PATH=$LOCAL_PATH/..:$PATH \
-	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 --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE"
+	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 --endian=LE"
 } || exit 1
 
 NCPU=4
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index b394d53be..9fc76f0d5 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit b394d53be82ec280e9c0909ce42779e6625c107c
+Subproject commit 9fc76f0d59c5975915731ee5a0456b1e901e247a
diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice
index 0b817c357..9f2803c7a 160000
--- a/project/jni/application/vice/vice
+++ b/project/jni/application/vice/vice
@@ -1 +1 @@
-Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c
+Subproject commit 9f2803c7abdb760845c2fa64cba0fd1b206d25a5
diff --git a/project/jni/boost/src b/project/jni/boost/src
index 5824acb45..bc9ea9d30 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd
+Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767
diff --git a/project/jni/shmem b/project/jni/shmem
index c2a28f528..f6b49516c 160000
--- a/project/jni/shmem
+++ b/project/jni/shmem
@@ -1 +1 @@
-Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a
+Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5