From 09f8a53a22ad775a5eff727321eca0d7a64bca56 Mon Sep 17 00:00:00 2001 From: Sergii Pylypenko Date: Wed, 22 Mar 2017 22:26:53 +0200 Subject: [PATCH] Fixed android-shmem compilation with NDK r14b, updated OpenTTD --- project/jni/application/openttd/AndroidAppSettings.cfg | 4 ++-- .../jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg | 1 + project/jni/application/openttd/src | 2 +- project/jni/shmem | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 4d7c9f612..e263c8ddc 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=17064 +AppVersionCode=17065 # Application user-visible version name (string) -AppVersionName="1.7.0.64-RC1" +AppVersionName="1.7.0.65-RC1" # 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 diff --git a/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg index 99738634a..aa3b801ba 100644 --- a/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg +++ b/project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg @@ -20,3 +20,4 @@ left_mouse_btn_scrolling = true osk_activation = disabled auto_scrolling = 0 reverse_scroll = true +windows_titlebars = false diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 1c4dcd494..cee6057bf 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 1c4dcd494fa71f74a73db003b2afb48107493162 +Subproject commit cee6057bf2f1bc1cbd172d23b74af06dd2d9e71d diff --git a/project/jni/shmem b/project/jni/shmem index f6b49516c..5375e8eee 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5 +Subproject commit 5375e8eeea8bf79663a1c8c0d971bfe989a3c14a