From 5c864f1051f005c4bb0f33f883c3211d05ad8deb Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 25 Aug 2014 01:00:44 +0300 Subject: [PATCH] Updated OpenTTD --- .../jni/application/openttd/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/openttd/build-pc.sh | 13 +++++++++++++ project/jni/application/openttd/pack-data.sh | 7 +++++++ project/jni/application/openttd/src | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100755 project/jni/application/openttd/build-pc.sh create mode 100755 project/jni/application/openttd/pack-data.sh diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index b5d1b1abf..1d4a56118 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=14233 +AppVersionCode=14234 # Application user-visible version name (string) -AppVersionName="1.4.2.33" +AppVersionName="1.4.2.34" # 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 @@ -18,7 +18,7 @@ AppVersionName="1.4.2.33" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS -AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.4.2.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.2.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz" +AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.4.2-1.zip.xz|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.4.2-1.zip.xz^!!Config file|:.openttd/openttd.cfg:openttd-1.4.0.30.cfg^!MIDI music support (18 Mb)|timidity.zip.xz|http://sourceforge.net/projects/libsdl-android/files/timidity.zip.xz^!!Internationalization files|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n @@ -201,7 +201,7 @@ FirstStartMenuOptions='' # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices, # but .apk size is 2x bigger (y) / (n) / (x86) / (all) -MultiABI='armeabi-v7a x86 mips' +MultiABI='armeabi-v7a' # x86 mips # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=0 diff --git a/project/jni/application/openttd/build-pc.sh b/project/jni/application/openttd/build-pc.sh new file mode 100755 index 000000000..19512033c --- /dev/null +++ b/project/jni/application/openttd/build-pc.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +LOCAL_PATH=`dirname $0` +LOCAL_PATH=`cd $LOCAL_PATH && pwd` + +mkdir -p openttd-pc openttd-pc/baseset +cd openttd-pc +[ -e bin/baseset ] || cp -a ../src/bin . + +[ -e Makefile ] || ../src/configure --enable-debug || exit 1 +make -j8 || exit 1 +cd bin +gdb -ex run ./openttd diff --git a/project/jni/application/openttd/pack-data.sh b/project/jni/application/openttd/pack-data.sh new file mode 100755 index 000000000..e83f41bea --- /dev/null +++ b/project/jni/application/openttd/pack-data.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +VER=1.4.2-1 + +cd data +rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip +zip -0 -r ../AndroidData/openttd-data-$VER.zip . && xz -8 ../AndroidData/openttd-data-$VER.zip diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src index 340e92511..b7ae49dda 160000 --- a/project/jni/application/openttd/src +++ b/project/jni/application/openttd/src @@ -1 +1 @@ -Subproject commit 340e925118b9f591f814fa099078d2ed0e26ab13 +Subproject commit b7ae49dda0b9ec5a9aa39177a33eea76ffd16683