diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 156a35808..e1bc76522 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=193000 +AppVersionCode=195000 # Application user-visible version name (string) -AppVersionName="1.9.3.0 Beta" +AppVersionName="1.9.5.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 @@ -220,7 +220,7 @@ AppCflags='-frtti -fexceptions -finline-functions -DOGG=1 -DANDROID=1 -DREFKEEN_ # Additional LDFLAGS for application #AppLdflags='-ltremor' -AppLdflags='-lvorbis -logg' +AppLdflags='-lvorbis -logg -lcrypto -lssl -lcurl' # If application has headers with the same name as system headers, this option tries to fix compiler flags to make it compilable AppOverlapsSystemHeaders= diff --git a/project/jni/application/commandergenius/banner.png b/project/jni/application/commandergenius/banner.png new file mode 100644 index 000000000..436168fdf Binary files /dev/null and b/project/jni/application/commandergenius/banner.png differ diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index c5210b0c4..b0b321ad4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit c5210b0c4209d6c9b6a49350057877448882a776 +Subproject commit b0b321ad47f2bd6c06d9c0cf85d7b93b08bc4661 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/openssl/include/openssl/opensslconf.h b/project/jni/openssl/include/openssl/opensslconf.h index 7817a54d9..b7704fb7f 100644 --- a/project/jni/openssl/include/openssl/opensslconf.h +++ b/project/jni/openssl/include/openssl/opensslconf.h @@ -118,8 +118,8 @@ extern "C" { #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "/home/pelya/src/endless_space/SDL-android/project/jni/openssl/build/armeabi-v7a/dist/lib/engines" -#define OPENSSLDIR "/home/pelya/src/endless_space/SDL-android/project/jni/openssl/build/armeabi-v7a/dist/ssl" +#define ENGINESDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/lib/engines" +#define OPENSSLDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/ssl" #endif #endif 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