From 4fcb4fce72a7b7c6d52cd16c6b265b61d5b29fc3 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Fri, 7 Apr 2017 23:42:56 +0300 Subject: [PATCH] OpenTTD: updated --- .../application/openttd/AndroidAppSettings.cfg | 2 +- .../openttd/AndroidData/binaries-armeabi-v7a.zip | Bin 0 -> 6290 bytes .../openttd/AndroidData/binaries-x86.zip | Bin 0 -> 3208 bytes project/jni/application/openttd/build-pc.sh | 2 +- project/jni/application/openttd/src | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip create mode 100644 project/jni/application/openttd/AndroidData/binaries-x86.zip diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index c7aae2940..66278d0dc 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -64,7 +64,7 @@ SdlVideoResize=y SdlVideoResizeKeepAspect=n # Do not allow device to sleep when the application is in foreground, set this for video players or apps which use accelerometer -InhibitSuspend=n +InhibitSuspend=y # Create Android service, so the app is less likely to be killed while in background CreateService= diff --git a/project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip b/project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip new file mode 100644 index 0000000000000000000000000000000000000000..923ed18854f60ba81e7021ee5c530e012e8e2fd3 GIT binary patch literal 6290 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 literal 0 HcmV?d00001 diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh index f15d7db1b..ff527cc69 100755 --- a/project/jni/application/openttd/build-pc.sh +++ b/project/jni/application/openttd/build-pc.sh @@ -18,7 +18,7 @@ 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 -g opntitle.sav else #gdb -ex run --args \ valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \ diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 3364c4288..650e37271 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 3364c4288db1e040a9e98dd5d30a8d7b20c16dcc +Subproject commit 650e3727100eebe2c5922a61ac0cb604e651106d