From 3fcfacdf58be9c292f1d0cbf2d405a177947a3be Mon Sep 17 00:00:00 2001 From: Miguel Horta Date: Tue, 12 Apr 2022 19:58:36 +0100 Subject: [PATCH] Bump openttd rev to 12.2 --- project/jni/application/openttd/.gitignore | 1 + project/jni/application/openttd/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd/pack-data.sh | 2 +- project/jni/application/openttd/src | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/project/jni/application/openttd/.gitignore b/project/jni/application/openttd/.gitignore index 6377bfc52..3affb537c 100644 --- a/project/jni/application/openttd/.gitignore +++ b/project/jni/application/openttd/.gitignore @@ -1,4 +1,5 @@ /openttd-build-* +/staging-openttd-build-* /AndroidData/*.xz /data /openttd-pc diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 43ad3fa5f..1108a72aa 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=1210109 +AppVersionCode=1220110 # Application user-visible version name (string) -AppVersionName="12.1.rev109" +AppVersionName="12.2.rev110" # 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,7 +22,7 @@ AppVersionName="12.1.rev109" # 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-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" +AppDataDownloadUrl="!!Data files|openttd-data-12.2-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=y diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh index 75e20d5d4..a07d2edf1 100755 --- a/project/jni/application/openttd/pack-data.sh +++ b/project/jni/application/openttd/pack-data.sh @@ -1,6 +1,6 @@ #!/bin/sh -VER=12.1-0 +VER=12.2-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 e99740b20..a63708013 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit e99740b20102be39ffeb175f702bb90df0ad0ad5 +Subproject commit a637080136e21fab47061e82f84310d00f78dcf4