diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 8a5039734..c5210b0c4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 8a50397340aaa93b10a49ec4589b2b7a9311ed34 +Subproject commit c5210b0c4209d6c9b6a49350057877448882a776 diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg index e9148fe76..86b84a2e8 100644 --- a/project/jni/application/openarena/AndroidAppSettings.cfg +++ b/project/jni/application/openarena/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenArena" AppFullName=ws.openarena.sdl # Application version code (integer) -AppVersionCode=08835 +AppVersionCode=08837 # Application user-visible version name (string) -AppVersionName="0.8.8.35" +AppVersionName="0.8.8.37" # 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/openarena/engine b/project/jni/application/openarena/engine index 3c94b5df0..e1c5a8f70 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit 3c94b5df06ffe8755ce213a495ee99283714f3c1 +Subproject commit e1c5a8f700ddda51d2a0dc4d289c02dd21a0bee5 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 84ebfb59e..20040462f 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 84ebfb59e31c24134b865cbe0d0fa1eb7aa7c57d +Subproject commit 20040462faf0a78ebd4b813d35127416686e65d6 diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 7a66372b0..d88807f97 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=16060 +AppVersionCode=16160 # Application user-visible version name (string) -AppVersionName="1.6.0.60" +AppVersionName="1.6.1.60" # 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.6.0.60" # 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.6.0-6.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|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.6.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|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2.zip.xz/download" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n @@ -242,7 +242,7 @@ NDK_TOOLCHAIN_VERSION=clang # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a x86_64 -MultiABI='armeabi armeabi-v7a x86 mips' +MultiABI='armeabi-v7a x86' # 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/build-pc.sh b/project/jni/application/openttd/build-pc.sh index c71958f6f..750614b08 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -18,8 +18,8 @@ cd bin export LD_LIBRARY_PATH=/usr/local/lib if [ -z "$1" ]; then - ./openttd -d 2 -r 854x480 -g opntitle.sav + ./openttd -d 2 -r 854x480 #-g opntitle.sav else gdb -ex run --args \ - ./openttd -d 2 -r 854x480 -g opntitle.sav + ./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 f9eebce0f..c544e94f0 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.6.0-6 +VER=1.6.1-0 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 a4b1b961a..57d41db36 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit a4b1b961ad30e12d1dda003588b7a0198e176578 +Subproject commit 57d41db36bbda8fbbd0d432f3e096411e25a1ecc diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice index 0b817c357..18d3739b3 160000 --- a/project/jni/application/vice/vice +++ b/project/jni/application/vice/vice @@ -1 +1 @@ -Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c +Subproject commit 18d3739b3368581ade39fd69767ab5fa321a4ccc diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio index 37ce31ed3..f04d54127 160000 --- a/project/jni/application/xserver/pulseaudio +++ b/project/jni/application/xserver/pulseaudio @@ -1 +1 @@ -Subproject commit 37ce31ed32cf34fcb2f2fdbda40b6f24a9dd3424 +Subproject commit f04d541277106e3310e4da6f84ebf4a8d2cb54ef diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 6ea1ce707..ad7ad4873 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 6ea1ce707be8ae1b5260bf7c5e36db568c7431c9 +Subproject commit ad7ad4873dcf38f8581145e4578a011d0cda6483 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