From d7ea0a43fb70a092b495c780aeed2a6dfaab602a Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Tue, 21 Mar 2017 20:24:09 +0100 Subject: [PATCH] OpenTTD: bump version --- project/jni/application/ninslash/src | 2 +- project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd/build-pc.sh | 2 +- project/jni/application/openttd/pack-data.sh | 2 +- project/jni/application/openttd/src | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index 58d9dd865..7c32fcaec 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit 58d9dd8655282adef12d648841f9ed837016a153 +Subproject commit 7c32fcaec449ec2ee894ee5ffa46c87df213b8ca diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index e81fea1c3..4d7c9f612 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=16164 +AppVersionCode=17064 # Application user-visible version name (string) -AppVersionName="1.6.1.64" +AppVersionName="1.7.0.64-RC1" # 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.1.64" # 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.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|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-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.0-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-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/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 06a7aea8c..ff527cc69 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -18,7 +18,7 @@ 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 \ valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index a22a208b2..2c74a2481 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.1-1 +VER=1.7.0-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 6fe577996..1c4dcd494 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 6fe5779964d63624cfc3f0541ad46ad1d65ccc69 +Subproject commit 1c4dcd494fa71f74a73db003b2afb48107493162