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

OpenTTD: bump version

Browse Source
This commit is contained in:
pelya
2020-03-24 23:51:28 +02:00
parent 409b173e25
commit 517eb7572c
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -41,7 +41,7 @@
[submodule "project/jni/application/openttd/src"]
path = project/jni/application/openttd/src
url = https://github.com/pelya/openttd-android.git
branch = 1.9
branch = 1.10
[submodule "project/jni/application/uae4all2"]
path = project/jni/application/uae4all2
url = https://github.com/lubomyr/uae4all2.git

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

@@ -7,10 +7,10 @@ AppName="OpenTTD"
AppFullName=org.openttd.sdl
# Application version code (integer)
AppVersionCode=19384
AppVersionCode=110084
# Application user-visible version name (string)
AppVersionName="1.9.3.84"
AppVersionName="1.10.0-RC1.84"
# 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
@@ -20,7 +20,7 @@ AppVersionName="1.9.3.84"
# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file
# You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries
# Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip
AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.9.3-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|icudt62l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz"
AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.10.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|icudt62l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt62l.zip.xz"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y

4
project/jni/application/openttd/build-pc.sh
View File

@@ -18,12 +18,12 @@ cd bin
export LD_LIBRARY_PATH=/usr/local/lib
if [ -z "$1" ]; then
./openttd -d 0 -m null -g opntitle.sav
./openttd -d 0 -m null -g opntitle.sav -r 854x480
elif [ -n "$2" ]; then
valgrind --track-fds=yes --log-file=../../valgrind.log --leak-check=full \
./openttd -d 0 -m null # -g opntitle.sav
else
#valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \
gdb -ex run --args \
./openttd -d 0 -m null -g opntitle.sav
./openttd -d 0 -m null -g opntitle.sav -r 854x480
fi

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

@@ -1,6 +1,6 @@
#!/bin/sh
VER=1.9.3-0
VER=1.10.0-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: a8a5328716...8bb59f70a6