From f84b9c5406ebc6a3ce0d10afa08520ce1308e134 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 8 Mar 2021 22:22:26 +0200 Subject: [PATCH] OpenTTD JGR: bump version --- .../jni/application/openttd-jgrpp/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd-jgrpp/pack-data.sh | 2 +- project/jni/application/openttd-jgrpp/src | 2 +- project/jni/application/openttd/AndroidPreBuild.sh | 2 +- project/jni/application/openttd/build-pc.sh | 4 ++-- project/jni/application/openttd/src | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index 31206e874..c56c9c922 100644 --- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD JGR" AppFullName=org.openttd.jgrpp # Application version code (integer) -AppVersionCode=040211 +AppVersionCode=040411 # Application user-visible version name (string) -AppVersionName="0.40.2" +AppVersionName="0.40.4" # 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="0.40.2" # 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|openttd-data-0.40.2-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-0.40.4-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-jgr-0.32.4.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization 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-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh index f1b8bf6dc..ae056873d 100755 --- a/project/jni/application/openttd-jgrpp/pack-data.sh +++ b/project/jni/application/openttd-jgrpp/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=0.40.2-0 +VER=0.40.4-0 cd data rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 1513fde9c..a1392a818 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 1513fde9c83472bb1477ffc909bd2f32612ea827 +Subproject commit a1392a8189d80a409d64f10f99ef6e748a897bbb diff --git a/project/jni/application/openttd/AndroidPreBuild.sh b/project/jni/application/openttd/AndroidPreBuild.sh index 8384a2028..3dcf1c3bd 100755 --- a/project/jni/application/openttd/AndroidPreBuild.sh +++ b/project/jni/application/openttd/AndroidPreBuild.sh @@ -1,5 +1,5 @@ #!/bin/sh mkdir -p build-tools -[ -e build-tools/Makefile ] || cmake -DOPTION_TOOLS_ONLY=ON -B build-tools src || exit 1 +[ -e build-tools/Makefile ] || cmake -DOPTION_TOOLS_ONLY=ON -B build-tools src make -C build-tools -j8 VERBOSE=1 || exit 1 diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 97fe39ca4..74242a2c1 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -17,12 +17,12 @@ cd bin cp -f ../baseset/opntitle.dat opntitle.sav if [ -z "$1" ]; then - ../openttd -d 2 -m null -g opntitle.sav -r 854x480 + ../openttd -d 2 -m null -r 854x480 # -g opntitle.sav elif [ -n "$2" ]; then valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \ ../openttd -d 0 -m null # -g opntitle.sav else #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ gdb -ex run --args \ - ../openttd -d 0 -m null -g opntitle.sav -r 854x480 + ../openttd -d 0 -m null -r 854x480 # -g opntitle.sav fi diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index b30622a63..a1d9bc6c8 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit b30622a637468447dbafac91670db072592f166f +Subproject commit a1d9bc6c8c92769c366e516edf5b29f65c1f4d5f