From 97d67c17bc5eeb3465795d181ea20788145b143c Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Sun, 17 Jul 2016 15:15:21 +0200 Subject: [PATCH] Free Heroes 2 Update --- .../application/commandergenius/AndroidAppSettings.cfg | 4 ++-- project/jni/application/commandergenius/commandergenius | 2 +- project/jni/application/fheroes2/AndroidAppSettings.cfg | 8 ++++---- project/jni/application/fheroes2/fheroes2 | 2 +- project/jni/application/vice/vice | 2 +- project/jni/boost/src | 2 +- project/jni/shmem | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index b8ed80efe..830e476da 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=195200 +AppVersionCode=195300 # Application user-visible version name (string) -AppVersionName="1.9.5.2 Beta" +AppVersionName="1.9.5.3 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 diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index d4dfb2189..91e5c4141 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit d4dfb21891a786cdc137cfc4901c1ad6982c10be +Subproject commit 91e5c414177251c976ca88f182bceaaa132ece85 diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 8fc4bb6d4..2879b406d 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -26,7 +26,7 @@ InhibitSuspend=n # 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="!Heroes 2 DEMO (45 Mb) - required if you don't own full version|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^!MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^!Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^!T-800 Mod Compaign|http://wiki.kvkozyrev.org/fheroes/androidcampainpak_v1.zip^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^!Engine files|data13.zip^!Engine fonts|data-cfg-fonts.zip^Russian translation|:fheroes2.cfg:fheroes2-ru.cfg^Czech translation|:fheroes2.cfg:fheroes2-cs.cfg^Spanish translation|:fheroes2.cfg:fheroes2-es.cfg^French translation|:fheroes2.cfg:fheroes2-fr.cfg^Hungarian translation|:fheroes2.cfg:fheroes2-hu.cfg^Polish translation|:fheroes2.cfg:fheroes2-pl.cfg^Portugese translation|:fheroes2.cfg:fheroes2-pt_BR.cfg^Swedish translation|:fheroes2.cfg:fheroes2-sv.cfg" +AppDataDownloadUrl="!Heroes 2 DEMO (45 Mb) - required if you don't own full version|http://image.dosgamesarchive.com/games/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^!MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^!Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^!T-800 Mod Compaign|http://wiki.kvkozyrev.org/fheroes/androidcampainpak_v1.zip^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^!Engine files|data13.zip^!Engine fonts|data-cfg-fonts.zip^Russian translation|:fheroes2.cfg:fheroes2-ru.cfg^Czech translation|:fheroes2.cfg:fheroes2-cs.cfg^Spanish translation|:fheroes2.cfg:fheroes2-es.cfg^French translation|:fheroes2.cfg:fheroes2-fr.cfg^Hungarian translation|:fheroes2.cfg:fheroes2-hu.cfg^Polish translation|:fheroes2.cfg:fheroes2-pl.cfg^Portugese translation|:fheroes2.cfg:fheroes2-pt_BR.cfg^Swedish translation|:fheroes2.cfg:fheroes2-sv.cfg" # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) @@ -180,10 +180,10 @@ MultiABI=n AppMinimumRAM=32 # Application version code (integer) -AppVersionCode=327801 +AppVersionCode=327810 # Application user-visible version name (string) -AppVersionName="3278.01" +AppVersionName="3278.10" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n @@ -200,7 +200,7 @@ CompiledLibraries="sdl_mixer sdl_image sdl_ttf sdl_net png intl" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-std=c++11 -finline-functions -O3 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_EDITOR -frtti' +AppCflags='-std=c++11 -finline-functions -O3 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DBUILD_RELEASE -DWITH_TTF -DWITH_AI=simple -DWITH_EDITOR -frtti' # Additional LDFLAGS for application AppLdflags='' diff --git a/project/jni/application/fheroes2/fheroes2 b/project/jni/application/fheroes2/fheroes2 index 9bfc898f7..1fa24d6ab 160000 --- a/project/jni/application/fheroes2/fheroes2 +++ b/project/jni/application/fheroes2/fheroes2 @@ -1 +1 @@ -Subproject commit 9bfc898f7eca111bf5ba659dddc2f411d416aa26 +Subproject commit 1fa24d6ab3e5ac36449be85d8a7dedf7541fa864 diff --git a/project/jni/application/vice/vice b/project/jni/application/vice/vice index 9f2803c7a..0b817c357 160000 --- a/project/jni/application/vice/vice +++ b/project/jni/application/vice/vice @@ -1 +1 @@ -Subproject commit 9f2803c7abdb760845c2fa64cba0fd1b206d25a5 +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