From a6f20b699b843d4ecc589e9f3ca45b2b89f8be87 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Mon, 2 Oct 2017 21:41:32 +0300 Subject: [PATCH] OpenTTD: disabled arm64 arch, maybe this will fix some of the crashes --- .../jni/application/openttd-jgrpp/AndroidAppSettings.cfg | 6 +++--- project/jni/application/openttd-jgrpp/build-pc.sh | 8 ++++---- project/jni/application/openttd-jgrpp/src | 2 +- project/jni/application/openttd/src | 2 +- 4 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 5fff0b9ac..de3f852ce 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=021074 +AppVersionCode=021075 # Application user-visible version name (string) -AppVersionName="0.21.0.74" +AppVersionName="0.21.0.75" # 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, other downloads should be selected by user from startup config menu @@ -244,7 +244,7 @@ NDK_TOOLCHAIN_VERSION=clang # Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a x86_64 -MultiABI='armeabi-v7a x86 arm64-v8a' +MultiABI='armeabi-v7a x86' # arm64-v8a # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed diff --git a/project/jni/application/openttd-jgrpp/build-pc.sh b/project/jni/application/openttd-jgrpp/build-pc.sh index c18359044..58f898790 100755 --- a/project/jni/application/openttd-jgrpp/build-pc.sh +++ b/project/jni/application/openttd-jgrpp/build-pc.sh @@ -18,9 +18,9 @@ cd bin export LD_LIBRARY_PATH=/usr/local/lib if [ -z "$1" ]; then - ./openttd -d 2 -r 854x480 -g opntitle.sav + ./openttd -d 2 -r 854x480 -b 16bpp-simple -g opntitle.sav else - #valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ - gdb -ex run --args \ - ./openttd -d 2 -r 854x480 -g opntitle.sav + #gdb -ex run --args \ + valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full --read-var-info=yes \ + ./openttd -d 2 -r 854x480 -b 16bpp-simple # -g opntitle.sav fi diff --git a/project/jni/application/openttd-jgrpp/src b/project/jni/application/openttd-jgrpp/src index 61f968a41..6e49fd0c4 160000 --- a/project/jni/application/openttd-jgrpp/src +++ b/project/jni/application/openttd-jgrpp/src @@ -1 +1 @@ -Subproject commit 61f968a41abd232c3825b30ff917531b44304aa7 +Subproject commit 6e49fd0c45cc349359344e66b5d13b85564d4986 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 429d476be..f82a4bf45 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 429d476be83d7ba89c64dcd792affddac0248450 +Subproject commit f82a4bf45afa809cf94983f5c0d2dcfb1c0747e5