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

project/jni/application/commandergenius/AndroidAppSettings.cfg

@@ -7,7 +7,7 @@ AppName="Commander Genius"
 AppFullName=net.sourceforge.clonekeenplus
 
 # Application version code (integer)
-AppVersionCode=195000
+AppVersionCode=195005
 
 # Application user-visible version name (string)
 AppVersionName="1.9.5.0 Beta"
@@ -18,7 +18,7 @@ AppVersionName="1.9.5.0 Beta"
 # 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="!Keen1|keen1.zip^!Keen4|keen4.zip^!Keen7|keen7.zip^!KeenDreams|keenDreams.zip^!KeenDreamsPlus|keenDreamsPlus.zip^!Accumulators|Accumulators.zip^High-quality GFX and music - 55 Mb|http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%202.x/hqpv26.zip/download"
+AppDataDownloadUrl="!Games Center|gamecatalogue.zip^!Keen1|keen1.zip^!Keen4|keen4.zip^High-quality GFX and music - 55 Mb|http://sourceforge.net/projects/clonekeenplus/files/High%20Quality%20Packs/Version%202.x/hqpv26.zip/download"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y

project/jni/application/openttd/AndroidAppSettings.cfg

@@ -7,10 +7,10 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 
 # Application version code (integer)
-AppVersionCode=16060
+AppVersionCode=16160
 
 # Application user-visible version name (string)
-AppVersionName="1.6.0.60"
+AppVersionName="1.6.1.60"
 
 # 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.6.0.60"
 # 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.6.0-6.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^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/zBase-v5588.zip.xz/download"
+AppDataDownloadUrl="!!Data files - 20 Mb|openttd-data-1.6.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|icudt52l.zip.xz|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip.xz^HD graphics - 220 Mb download|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/abase-0.1.2.zip.xz/download"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
@@ -242,7 +242,7 @@ NDK_TOOLCHAIN_VERSION=clang
 
 # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
 # Available architectures: armeabi armeabi-v7a x86 mips arm64-v8a x86_64
-MultiABI='armeabi armeabi-v7a x86 mips'
+MultiABI='armeabi-v7a x86'
 
 # 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

project/jni/application/openttd/build-pc.sh

@@ -18,8 +18,8 @@ cd bin
 export LD_LIBRARY_PATH=/usr/local/lib
 
 if [ -z "$1" ]; then
-	./openttd -d 2 -r 854x480 -g opntitle.sav
+	./openttd -d 2 -r 854x480 #-g opntitle.sav
 else
 	gdb -ex run --args \
-	./openttd -d 2 -r 854x480 -g opntitle.sav
+	./openttd -d 2 -r 854x480 #-g opntitle.sav
 fi

project/jni/application/openttd/pack-data.sh

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