diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index bcc291a69..661908552 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=111093 +AppVersionCode=111094 # Application user-visible version name (string) -AppVersionName="1.11.0-beta1.93" +AppVersionName="1.11.0-beta1.rev94" # 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 4cb31f88f..51aa1cec2 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -49,6 +49,9 @@ export ARCH=$1 # Hack for FREETYPE_INCLUDE_DIRS echo "set(${TARGET}_INCLUDE_DIRS $LOCAL_PATH/../../$LIB/include)" >> $CMAKE_SDL ;; + fontconfig) + TARGET=Fontconfig + ;; icui18n|iculx|icuuc|icudata|icule|icuio) TARGET="ICU_`echo $LIB | sed 's/icu//'`" echo "set(PC_${TARGET}_INCLUDE_DIRS $LOCAL_PATH/../../$LIB/include)" >> $CMAKE_SDL diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 836891221..40f573cb9 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 8368912214a692657f70b8d1ee3c25f0e5ceb900 +Subproject commit 40f573cb9188937a73649c0164f123bf93dc231d