diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg index 8cbe8054a..0a333ed4a 100644 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD lowmem" AppFullName=org.openttd.sdl.lowmem # Application version code (integer) -AppVersionCode=14027 +AppVersionCode=14028 # Application user-visible version name (string) -AppVersionName="1.4.0.27" +AppVersionName="1.4.0.28" # 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 @@ -24,7 +24,7 @@ AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl- ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg" +DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg .openttd/openttd.cfg" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ diff --git a/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg b/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg index 51d2e1375..6b86c64e3 100644 --- a/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg +++ b/project/jni/application/openttd-lowmem/AndroidData/openttd-1.4.0.27.cfg @@ -19,3 +19,5 @@ min_step_size = 40 [gui] left_mouse_btn_scrolling = true osk_activation = disabled +auto_scrolling = 2 + diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 2e53f4036..73b36ed09 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=14027 +AppVersionCode=14028 # Application user-visible version name (string) -AppVersionName="1.4.0.27" +AppVersionName="1.4.0.28" # 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 @@ -24,7 +24,7 @@ AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl- ResetSdlConfigForThisVersion=y # Delete application data files when upgrading (specify file/dir paths separated by spaces) -DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg" +DeleteFilesOnUpgrade="baseset .openttd/windows.cfg .openttd/hotkeys.cfg .openttd/openttd.cfg" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 4b5605fe0..315ad2faa 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -13,6 +13,7 @@ VER=1.4.0-beta5 export ARCH=$1 [ -e openttd-$VER-$1/Makefile ] || { + rm -f src/src/rev.cpp ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --host=$2 --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/$ARCH/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'" } || exit 1 diff --git a/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg b/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg index ca30b2386..cc4467b06 100644 --- a/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg +++ b/project/jni/application/openttd/AndroidData/openttd-1.4.0.27.cfg @@ -18,3 +18,4 @@ min_step_size = 40 [gui] left_mouse_btn_scrolling = true osk_activation = disabled +auto_scrolling = 2 diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index f30d497cc..19d76ddbb 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit f30d497cc15fa750949fabfccc94d5b14fcf1a5a +Subproject commit 19d76ddbbd21bde7c8e3af43a17e8c1059836e91 diff --git a/project/jni/application/xserver-gimp/xserver b/project/jni/application/xserver-gimp/xserver index 68765fa3a..0d6c8e37a 160000 --- a/project/jni/application/xserver-gimp/xserver +++ b/project/jni/application/xserver-gimp/xserver @@ -1 +1 @@ -Subproject commit 68765fa3adc1d6b74b61e5eceb22cf33bc578681 +Subproject commit 0d6c8e37a0027ecbe865bc477e3fff237ed58aa2 diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index 0d6c8e37a..e8559f1c9 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit 0d6c8e37a0027ecbe865bc477e3fff237ed58aa2 +Subproject commit e8559f1c939049eed3b967b28f3d9c28a8f6d73e