diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 0ea626055..cfbbae3e6 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=182300 +AppVersionCode=190000 # Application user-visible version name (string) -AppVersionName="1.8.3.0 Release" +AppVersionName="1.9.0.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.8.3.0 Release" # 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^!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^!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 @@ -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='y' +MultiABI='armeabi-v7a mips x86' # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower AppMinimumRAM=64 @@ -215,7 +215,8 @@ CompiledLibraries="ogg sdl_image boost_system" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DANDROID=1 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/lib/GsKit -Ijni/vorbis/include/vorbis' +AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DANDROID=1 -DREFKEEN_VER_KDREAMS -DGRMODE=EGAGR -DREFKEEN_VER_KDREAMS_ANYEGA_ALL -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -DNOTYPESAVE -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11 -Ijni/../jni/application/commandergenius/commandergenius/lib/GsKit -Ijni/vorbis/include/vorbis' + # Additional LDFLAGS for application #AppLdflags='-ltremor' diff --git a/project/jni/application/commandergenius/AndroidData/Accumulators.zip b/project/jni/application/commandergenius/AndroidData/Accumulators.zip index 049f1de15..c085734cd 100644 Binary files a/project/jni/application/commandergenius/AndroidData/Accumulators.zip and b/project/jni/application/commandergenius/AndroidData/Accumulators.zip differ diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 32b2e006f..e762fadb5 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 32b2e006f9facb81db41125ddf2e9365e6b5075b +Subproject commit e762fadb5bddc31168f163814242742087075d47 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