From 5c2dd33dff5088ea63c284df888823fc547b5376 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 15 Mar 2021 22:32:43 +0200 Subject: [PATCH] OpenTTD: bump version --- project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd/build-pc.sh | 4 +--- project/jni/application/openttd/pack-data.sh | 2 +- project/jni/application/openttd/src | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index bf0016fef..2f030e27b 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=111098 +AppVersionCode=111099 # Application user-visible version name (string) -AppVersionName="1.11.0-beta2.rev98" +AppVersionName="1.11.0-RC1.rev99" # 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, '!!' will also hide the entry from the menu, so it cannot be disabled @@ -20,7 +20,7 @@ AppVersionName="1.11.0-beta2.rev98" # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip -AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.11.0-1.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|https://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz|https://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.11.0-2.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz|https://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz|https://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 74242a2c1..e3e8b0d18 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -2,15 +2,13 @@ LOCAL_PATH=`dirname $0` LOCAL_PATH=`cd $LOCAL_PATH && pwd` +export PATH=$HOME/src/endless_space/gdb-10/bin:$PATH mkdir -p openttd-pc openttd-pc/baseset cd openttd-pc [ -e bin/baseset ] || cp -a ../src/bin ./ [ -e bin/fonts ] || cp -a ../data/fonts bin/ -export CFLAGS=-O0 -export CXXFLAGS=-O0 - [ -e Makefile ] || cmake ../src || exit 1 make -j8 VERBOSE=1 || exit 1 cd bin diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index f7d682385..a3bdbf2eb 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.11.0-1 +VER=1.11.0-2 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 a1d9bc6c8..78c60cc89 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit a1d9bc6c8c92769c366e516edf5b29f65c1f4d5f +Subproject commit 78c60cc89694d8bee2b1a04a544e983d1777d478