From a74faccf379e8ba3aab47c01c7e690c25f33dcfb Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sun, 3 Apr 2016 12:23:14 +0200 Subject: [PATCH 1/2] Commander Genius Version update --- .../jni/application/commandergenius/AndroidAppSettings.cfg | 6 +++--- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/vice/vice | 2 +- project/jni/boost/src | 2 +- project/jni/shmem | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index cfbbae3e6..bd2190ebc 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Commander Genius" AppFullName=net.sourceforge.clonekeenplus # Application version code (integer) -AppVersionCode=190000 +AppVersionCode=192000 # Application user-visible version name (string) -AppVersionName="1.9.0.0 Beta" +AppVersionName="1.9.2.0 Beta" # 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.9.0.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^!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="!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" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index c5210b0c4..9adfff8b6 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit c5210b0c4209d6c9b6a49350057877448882a776 +Subproject commit 9adfff8b630deb503f2f2be48af9b43a6b0b658b diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice index 18d3739b3..0b817c357 160000 --- a/project/jni/application/vice/vice +++ b/project/jni/application/vice/vice @@ -1 +1 @@ -Subproject commit 18d3739b3368581ade39fd69767ab5fa321a4ccc +Subproject commit 0b817c357e5a25d37df98d97930469bd485ebb4c diff --git a/project/jni/boost/src b/project/jni/boost/src index bc9ea9d30..5824acb45 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767 +Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd diff --git a/project/jni/shmem b/project/jni/shmem index f6b49516c..c2a28f528 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit f6b49516cf4b13f455a19ec989626be5472830c5 +Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a From 63e0ba38fa9000ade546a93233181801621a5b96 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sun, 3 Apr 2016 12:54:24 +0200 Subject: [PATCH 2/2] Apparently all build version compile fine wit CG. Even 64-bit ones... --- project/jni/application/commandergenius/AndroidAppSettings.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index bd2190ebc..d966ac340 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -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 mips x86' +MultiABI='all' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=64