diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg index 6db0103d7..bb3eaa6eb 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=02829 +AppVersionCode=03030 # Application user-visible version name (string) -AppVersionName="0.2.8.29" +AppVersionName="0.3.0.30" # 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 @@ -255,7 +255,7 @@ APP_PLATFORM=android-21 # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a -MultiABI='armeabi-v7a x86' +MultiABI='armeabi-v7a x86 arm64-v8a' # 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/ninslash/AndroidPreBuild.sh b/project/jni/application/ninslash/AndroidPreBuild.sh index 9609b5582..9ab704d81 100755 --- a/project/jni/application/ninslash/AndroidPreBuild.sh +++ b/project/jni/application/ninslash/AndroidPreBuild.sh @@ -28,7 +28,7 @@ rm -f ../AndroidData/data.zip zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" >/dev/null -for ARCH in armeabi-v7a x86; do +for ARCH in armeabi-v7a x86 arm64-v8a; do [ -e ../AndroidData/binaries-$ARCH.zip ] && \ find `cat ../server-sources.txt` -cnewer ../AndroidData/binaries-$ARCH.zip | \ [ `wc -c` -eq 0 ] && continue diff --git a/project/jni/application/ninslash/server-sources.txt b/project/jni/application/ninslash/server-sources.txt index ebd70aad3..51a206bef 100644 --- a/project/jni/application/ninslash/server-sources.txt +++ b/project/jni/application/ninslash/server-sources.txt @@ -1,5 +1,6 @@ src/game/server/*.cpp src/game/server/*/*.cpp + src/game/server/*/*/*.cpp src/game/*.cpp src/engine/server/*.cpp src/engine/shared/*.cpp diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index 46b176a82..db7c9d5b7 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit 46b176a82547085e83fc0cebf5eca3635b78e340 +Subproject commit db7c9d5b73e5c1117c0226945c523792fa729218 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 0be4da4e9..aa74df1ec 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=17170 +AppVersionCode=17171 # Application user-visible version name (string) -AppVersionName="1.7.1.70" +AppVersionName="1.7.1.71" # 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 @@ -18,7 +18,7 @@ AppVersionName="1.7.1.70" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.7.1-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz^HD graphics (optional) - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2-0.zip.xz/download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.7.1-1.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz^HD graphics (optional) - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2-0.zip.xz/download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n diff --git a/project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip b/project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip deleted file mode 100644 index 923ed1885..000000000 Binary files a/project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip and /dev/null differ diff --git a/project/jni/application/openttd/AndroidData/binaries-x86.zip b/project/jni/application/openttd/AndroidData/binaries-x86.zip deleted file mode 100644 index 6b7409f50..000000000 Binary files a/project/jni/application/openttd/AndroidData/binaries-x86.zip and /dev/null differ diff --git a/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg index 5d5d6ecb2..17b4a40e3 100644 --- a/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg +++ b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg @@ -22,3 +22,4 @@ auto_scrolling = 0 reverse_scroll = true windows_titlebars = false windows_decorations = true +compact_vertical_toolbar = true diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index ff527cc69..c4ca31ab1 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -21,6 +21,6 @@ if [ -z "$1" ]; then ./openttd -d 2 -r 854x480 -g opntitle.sav else #gdb -ex run --args \ - valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ + #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ ./openttd -d 2 -r 854x480 #-g opntitle.sav fi diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 4f6d63d46..536b14fca 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=1.7.1-0 +VER=1.7.1-1 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 3688f7357..8ce569441 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 3688f73576f9b423d10d8bea8ba532a1f654a6f3 +Subproject commit 8ce5694417199eb41ef1fbc6883544dbe448d61b