miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTTD: update to 1.9.1

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-04-24 20:41:57 +03:00
parent b5a391b0dd
commit 20d59c5920
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/openttd/AndroidAppSettings.cfg
View File

@@ -7,10 +7,10 @@ AppName="OpenTTD"
AppFullName=org.openttd.sdl
# Application version code (integer)
AppVersionCode=18076
AppVersionCode=19177
# Application user-visible version name (string)
AppVersionName="1.8.0.76"
AppVersionName="1.9.1.77"
# 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.8.0.76"
# 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
# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file
AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.8.0-0.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|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz"
AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.9.1-0.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|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y

9
project/jni/application/openttd/AndroidBuild.sh
View File

@@ -12,15 +12,20 @@ CPU_TYPE=32
[ "$ARCH" = "arm64-v8a" ] && CPU_TYPE=64
[ "$ARCH" = "x86_64" ] && CPU_TYPE=64
[ -e openttd-$VER-$1/bin/baseset/orig_extra.grf ] || {
mkdir -p openttd-$VER-$1/bin
cp -a src/bin/baseset openttd-$VER-$1/bin/
} || exit 1
[ -e openttd-$VER-$1/objs/lang/english.lng ] || {
sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --endian=LE --cpu-type=$CPU_TYPE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1
sh -c "cd openttd-$VER-$1 && ../src/configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --cpu-type=$CPU_TYPE && make lang && make -C objs/release endian_target.h depend && make -C objs/setting" || exit 1
rm -f openttd-$VER-$1/Makefile
} || exit 1
[ -e openttd-$VER-$1/Makefile ] || {
rm -f src/src/rev.cpp
env PATH=$LOCAL_PATH/..:$PATH \
env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity='pkg-config libtimidity' --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --endian=LE --cpu-type=$CPU_TYPE"
env CLANG=1 ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ../src/configure --with-sdl --with-freetype --with-png --with-zlib --with-icu --with-libtimidity='pkg-config libtimidity' --with-lzo2=$LOCAL_PATH/../../../obj/local/$ARCH/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --with-fontconfig --with-lzma --cpu-type=$CPU_TYPE"
} || exit 1
NCPU=4

2
project/jni/application/openttd/pack-data.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh
VER=1.8.0-0
VER=1.9.1-0
cd data
rm -f ../AndroidData/openttd-data-*.zip.xz ../AndroidData/openttd-data-*.zip

2
project/jni/application/openttd/src

Submodule project/jni/application/openttd/src updated: 8b99198d00...a4d53d80e9