From 4e8bf7a5ae0ba43b4d7321b6e963d5c8a23e39dc Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 4 Sep 2019 15:30:31 +0300 Subject: [PATCH] OpenTTD: updated build scripts --- project/jni/application/openttd/AndroidAppSettings.cfg | 4 ++-- project/jni/application/openttd/AndroidBuild.sh | 2 +- project/jni/application/openttd/src | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 5f5a74b21..f8277647a 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=19283 +AppVersionCode=19284 # Application user-visible version name (string) -AppVersionName="1.9.2.83" +AppVersionName="1.9.2.84" # 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 diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index d3c6acecd..cd628874a 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -32,7 +32,7 @@ CPU_TYPE=32 env CXXFLAGS_BUILD="-I." \ env LDFLAGS_BUILD="-L." \ 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 --with-freetype --with-png --with-zlib --with-icu --with-libtimidity --without-fluidsynth \ --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' \ --without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE --os=android --cc-build=gcc --cxx-build=g++" } || exit 1 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 728ea1ee2..ffcda991e 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 728ea1ee2672567bf7725bbca46852601dcca489 +Subproject commit ffcda991e7b2000264d982a5b6b21d45b70ab182