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

Merge branch 'sdl_android' of github.com:pelya/commandergenius into

Browse Source 
sdl_android
This commit is contained in:
Gerhard Stein
2017-07-07 18:14:31 +02:00
parent 8e87817255 75eddb701a
commit a322e85cd7
11 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,10 +7,10 @@ AppName="Ninslash"
AppFullName=ninslash.com
# Application version code (integer)
AppVersionCode=02829
AppVersionCode=03030
# Application user-visible version name (string)
AppVersionName="0.2.8.29"
AppVersionName="0.3.0.30"
# 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
@@ -255,7 +255,7 @@ APP_PLATFORM=android-21
# Specify architectures to compile, 'all' or 'y' to compile for all architectures.
# Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a
MultiABI='armeabi-v7a x86'
MultiABI='armeabi-v7a x86 arm64-v8a'
# Optional shared libraries to compile - removing some of them will save space
# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed

2
project/jni/application/ninslash/AndroidPreBuild.sh
View File

@@ -28,7 +28,7 @@ rm -f ../AndroidData/data.zip
zip -r ../AndroidData/data.zip data *.txt *.cfg "example configs" >/dev/null
for ARCH in armeabi-v7a x86; do
for ARCH in armeabi-v7a x86 arm64-v8a; do
[ -e ../AndroidData/binaries-$ARCH.zip ] && \
find `cat ../server-sources.txt` -cnewer ../AndroidData/binaries-$ARCH.zip | \
[ `wc -c` -eq 0 ] && continue

1
project/jni/application/ninslash/server-sources.txt
View File

@@ -1,5 +1,6 @@
src/game/server/*.cpp
src/game/server/*/*.cpp
src/game/server/*/*/*.cpp
src/game/*.cpp
src/engine/server/*.cpp
src/engine/shared/*.cpp

2
project/jni/application/ninslash/src

Submodule project/jni/application/ninslash/src updated: 46b176a825...db7c9d5b73

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

@@ -7,10 +7,10 @@ AppName="OpenTTD"
AppFullName=org.openttd.sdl
# Application version code (integer)
AppVersionCode=17170
AppVersionCode=17171
# Application user-visible version name (string)
AppVersionName="1.7.1.70"
AppVersionName="1.7.1.71"
# 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.7.1.70"
# 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.7.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^HD graphics (optional) - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2-0.zip.xz/download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download"
AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.7.1-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|icudt59l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt59l.zip.xz^HD graphics (optional) - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2-0.zip.xz/download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=n

BIN
project/jni/application/openttd/AndroidData/binaries-armeabi-v7a.zip
View File

Binary file not shown.

BIN
project/jni/application/openttd/AndroidData/binaries-x86.zip
View File

Binary file not shown.

1
project/jni/application/openttd/AndroidData/openttd-1.4.0.30.cfg
View File

@@ -22,3 +22,4 @@ auto_scrolling = 0
reverse_scroll = true
windows_titlebars = false
windows_decorations = true
compact_vertical_toolbar = true

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

@@ -21,6 +21,6 @@ if [ -z "$1" ]; then
./openttd -d 2 -r 854x480 -g opntitle.sav
else
#gdb -ex run --args \
valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \
#valgrind --track-fds=yes --log-file=valgrind.log --leak-check=full \
./openttd -d 2 -r 854x480 #-g opntitle.sav
fi

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

@@ -1,6 +1,6 @@
#!/bin/sh
VER=1.7.1-0
VER=1.7.1-1
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: 3688f73576...8ce5694417