From dd1d2c1be678b43c1fefd37870c8909edbf18dba Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Sat, 11 Dec 2021 00:43:42 +0200 Subject: [PATCH] OpenTTD: updated project files --- project/jni/application/openttd/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openttd/build-pc.sh | 9 +++++++-- project/jni/application/openttd/pack-data.sh | 2 +- project/jni/application/openttd/src | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 129a3cd43..43ad3fa5f 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=1112108 +AppVersionCode=1210109 # Application user-visible version name (string) -AppVersionName="1.11.2.rev108" +AppVersionName="12.1.rev109" # 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 @@ -22,10 +22,10 @@ AppVersionName="1.11.2.rev108" # The mount directory will be returned by calling getenv("ANDROID_OBB_MOUNT_DIR") # 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-1.11.2-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^!!Fonts|openttd-fonts.zip.xz|https://sourceforge.net/projects/libsdl-android/files/openttd-fonts.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-12.1-0.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^!!Fonts|openttd-fonts.zip.xz|https://sourceforge.net/projects/libsdl-android/files/openttd-fonts.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) -ResetSdlConfigForThisVersion=n +ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag ai/regression ai/stationlist" diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index 780150d1a..e882f19a7 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -7,7 +7,12 @@ 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/ +[ -e bin/fonts ] || { + xz -d < ../AndroidData/openttd-fonts.zip.xz > bin/fonts.zip + cd bin + unzip fonts.zip + cd .. +} [ -e Makefile ] || cmake ../src || exit 1 make -j8 VERBOSE=1 || exit 1 @@ -15,7 +20,7 @@ cd bin cp -f ../baseset/opntitle.dat opntitle.sav if [ -z "$1" ]; then - ../openttd -d 0 -m null -r 854x480 -g opntitle.sav + ../openttd -d 0 -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 diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 662c1fd83..75e20d5d4 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.2-2 +VER=12.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 ea4d7f973..0eaaeecaa 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit ea4d7f97379d927bca6345130fd543fed03518d6 +Subproject commit 0eaaeecaad9926f401ccc3f41baef93a00766b0f