From b5012d86ad5f9bbaa6c8caac7f26f3a2ff1489ac Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Thu, 17 Oct 2019 20:28:05 +0300 Subject: [PATCH] OpenTTD-JGR: updated build scripts, bump version --- .../jni/application/openttd-jgrpp/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd-jgrpp/AndroidBuild.sh | 2 +- project/jni/application/openttd-jgrpp/pack-data.sh | 2 +- project/jni/application/openttd-jgrpp/src | 2 +- project/jni/application/xserver/pulseaudio | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index 84f7699e4..aae094c39 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=031501 +AppVersionCode=032001 # Application user-visible version name (string) -AppVersionName="0.31.5" +AppVersionName="0.32.0" # 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.31.5" # 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.31.5-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!!MIDI music support (18 Mb)|timidity.zip.xz^!!Internationalization files|icudt62l.zip.xz" +AppDataDownloadUrl="!!Data files|openttd-data-0.32.0-0.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.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/AndroidBuild.sh b/project/jni/application/openttd-jgrpp/AndroidBuild.sh index cab0a5446..c53f8126e 100755 --- a/project/jni/application/openttd-jgrpp/AndroidBuild.sh +++ b/project/jni/application/openttd-jgrpp/AndroidBuild.sh @@ -33,7 +33,7 @@ CPU_TYPE=32 env LDFLAGS_BUILD="-L." \ env ANDROID=1 \ env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure \ - --with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity='pkg-config libtimidity' \ + --with-sdl=sdl1 --with-freetype --with-png --with-zlib --with-icu --with-libtimidity='pkg-config libtimidity' \ --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' \ --without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE --os=unix --cc-build=gcc --cxx-build=g++ \ --without-sse --without-xdg-basedir --without-fluidsynth" diff --git a/project/jni/application/openttd-jgrpp/pack-data.sh b/project/jni/application/openttd-jgrpp/pack-data.sh index dbdfda8cf..b60fede18 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.31.5-0 +VER=0.32.0-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 e6bbdfea2..8285bf4ff 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit e6bbdfea29451ad0c6f9976415f9a521f0efbe01 +Subproject commit 8285bf4ff936d1ad12f0d03dc34a7975413ff1b3 diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio index e60d0d3af..f562f5350 160000 --- a/project/jni/application/xserver/pulseaudio +++ b/project/jni/application/xserver/pulseaudio @@ -1 +1 @@ -Subproject commit e60d0d3af27bb5128568d25be7aa5aaddb3c2cde +Subproject commit f562f53507251dc6ed29d941b27079442c3c5cd2