From 962b6ae000a9c1a300ec8eed07ca5b444ddf96a7 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 30 Sep 2016 21:42:13 +0300 Subject: [PATCH] Ninslash: update build scripts --- project/jni/application/ninslash/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/ninslash/AndroidPreBuild.sh | 8 +++++--- project/jni/application/ninslash/src | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg index 3b97a5cfd..a3265698c 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=01804 +AppVersionCode=01805 # Application user-visible version name (string) -AppVersionName="0.1.8.04 pre-alpha early access" +AppVersionName="0.1.8.05 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 @@ -257,13 +257,13 @@ CompiledLibraries="sdl_image freetype glu" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-O2 -flto -Werror=format -isystem jni/application/src/src/src/base/android' +AppCflags='-O2 -Werror=format -isystem jni/application/src/src/src/base/android' # -flto # Aditional C++-specific compiler flags for application, added after AppCflags AppCppflags='-std=c++11' # Additional LDFLAGS for application -AppLdflags='-lEGL -flto' +AppLdflags='-lEGL' # -flto # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable AppOverlapsSystemHeaders=n diff --git a/project/jni/application/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh index 7d7e5f3bf..8534a618a 100755 --- a/project/jni/application/ninslash/AndroidPreBuild.sh +++ b/project/jni/application/ninslash/AndroidPreBuild.sh @@ -20,14 +20,16 @@ python datasrc/compile.py server_content_header > src/game/generated/server_data python scripts/cmd5.py src/engine/shared/protocol.h src/game/generated/protocol.h src/game/tuning.h src/game/gamecore.cpp src/game/generated/protocol.h > src/game/generated/nethash.cpp } -[ -n "`find data *.txt *.cfg -cnewer ../AndroidData/data.zip 2>&1`" ] && { +[ -n "`find data *.txt *.cfg 'example configs' -cnewer ../AndroidData/data.zip 2>&1`" ] && { echo "Archiving data" mkdir -p ../AndroidData -zip -r ../AndroidData/data.zip data *.txt *.cfg >/dev/null +zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" >/dev/null } for ARCH in armeabi-v7a x86; do - [ -e ../AndroidData/binaries-$ARCH.zip ] && continue + [ -e ../AndroidData/binaries-$ARCH.zip ] && \ + find `cat ../server-sources.txt` -cnewer ../AndroidData/binaries-$ARCH.zip | \ + [ `wc -c` -eq 0 ] && continue rm -rf ninslash_srv mkdir -p objs # server-sources.txt generated by running bam server_release 2>&1 | tee build.log diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index 36a49624a..85fd31e23 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit 36a49624a39ff6499bc56329c64de1fe4430156e +Subproject commit 85fd31e23ac6bfc79e74f6ec8a2fbd6e5047b03c