From 76a19e18cbfa907a2ddcf087902122454619ef44 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Mon, 10 Oct 2016 16:01:15 +0300
Subject: [PATCH] Ninslash: updated build scripts

---
 .../application/ninslash/AndroidAppSettings.cfg  |  4 ++--
 .../jni/application/ninslash/AndroidPreBuild.sh  | 16 +++++++---------
 project/jni/application/ninslash/src             |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg
index 0e532f4ab..7c9cadf0d 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=01806
+AppVersionCode=01908
 
 # Application user-visible version name (string)
-AppVersionName="0.1.8.06 pre-alpha early access"
+AppVersionName="0.1.9.08 pre-alpha early access"
 
 # 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/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh
index 8534a618a..fa1f96954 100755
--- a/project/jni/application/ninslash/AndroidPreBuild.sh
+++ b/project/jni/application/ninslash/AndroidPreBuild.sh
@@ -31,26 +31,24 @@ for ARCH in armeabi-v7a x86; do
 		find `cat ../server-sources.txt` -cnewer ../AndroidData/binaries-$ARCH.zip | \
 		[ `wc -c` -eq 0 ] && continue
 	rm -rf ninslash_srv
-	mkdir -p objs
+	mkdir -p objs-srv-$ARCH bin/$ARCH
 	# server-sources.txt generated by running bam server_release 2>&1 | tee build.log
 	# and parsing logs with grep -o ' [^ ]*[.]cp\?p\?' build.log | grep -v /zlib/ > ../server-sources.txt
 	echo "Building teeworlds_srv for $ARCH"
-	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ../../setEnvironment-$ARCH.sh \
+	env BUILD_EXECUTABLE=1 NO_SHARED_LIBS=1 ARCH=$ARCH ../../setEnvironment-$ARCH.sh \
 		sh -c '
 		set -x
 		OBJS=
 		for F in `cat ../server-sources.txt`; do
-			dirname objs/$F.o | xargs mkdir -p
+			dirname objs-srv-$ARCH/$F.o | xargs mkdir -p
 			echo $F
-			OBJS="$OBJS objs/$F.o"
-			$CXX $CFLAGS -fno-exceptions -fno-rtti --std=c++11 -flto -Wall -DCONF_RELEASE -I src -c $F -o objs/$F.o || exit 1
+			OBJS="$OBJS objs-srv-$ARCH/$F.o"
+			$CXX $CFLAGS -fno-exceptions -fno-rtti --std=c++11 -flto -Wall -DCONF_RELEASE -I src -c $F -o objs-srv-$ARCH/$F.o || exit 1
 		done
 		echo Linking ninslash_srv
-		$CXX $CFLAGS -fno-exceptions -fno-rtti $OBJS $LDFLAGS -pie -flto -pthread -o ninslash_srv || exit 1
-		$STRIP --strip-unneeded ninslash_srv
+		$CXX $CFLAGS -fno-exceptions -fno-rtti $OBJS $LDFLAGS -pie -flto -pthread -o bin/$ARCH/ninslash_srv || exit 1
+		$STRIP --strip-unneeded bin/$ARCH/ninslash_srv
 		' || exit 1
-	mkdir -p bin/$ARCH
-	mv -f ninslash_srv bin/$ARCH/
 	cd bin/$ARCH
 	zip ../../../AndroidData/binaries-$ARCH.zip *
 	cd ../..
diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src
index f5bbc397e..38999155c 160000
--- a/project/jni/application/ninslash/src
+++ b/project/jni/application/ninslash/src
@@ -1 +1 @@
-Subproject commit f5bbc397ec637f463c1756639445c8d757341325
+Subproject commit 38999155c46462cbb48c7affb4ef4bed3a0a81f4