From e9bccd21bf5e097fa14e63040f1ee1b92123b345 Mon Sep 17 00:00:00 2001 From: pelya Date: Wed, 26 Jan 2011 09:53:20 +0000 Subject: [PATCH] Fixed bug in previous commit with __SDL_fake_stdout not defined, updated fheroes2 project --- project/jni/application/Android.mk | 2 +- .../fheroes2/AndroidAppSettings.cfg | 6 +++--- .../AndroidData/{data6.zip => data7.zip} | Bin 848322 -> 850000 bytes project/jni/application/src | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename project/jni/application/fheroes2/AndroidData/{data6.zip => data7.zip} (98%) diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk index eaff0fa39..2f6de9ce4 100644 --- a/project/jni/application/Android.mk +++ b/project/jni/application/Android.mk @@ -22,7 +22,7 @@ endif LOCAL_CFLAGS += $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \ -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \ - $(foreach L, $(COMPILED_LIBRARIES), -I$(LOCAL_PATH)/../$(L)/include) + $(foreach L, $(COMPILED_LIBRARIES), -I$(LOCAL_PATH)/../$(L)/include) \ -D__sF=__SDL_fake_stdout LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS) diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index b6f449b63..777262774 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="Free Heroes 2" AppFullName=net.sourceforge.fheroes2 ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Game data|data6.zip^Heroes 2 DEMO data files (45 Mb)|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^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^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download" +AppDataDownloadUrl="Game data|data7.zip^Heroes 2 DEMO data files (45 Mb)|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^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^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" MultiABI=n -AppVersionCode=219311 -AppVersionName="2193.11" +AppVersionCode=224411 +AppVersionName="2244.11" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple' diff --git a/project/jni/application/fheroes2/AndroidData/data6.zip b/project/jni/application/fheroes2/AndroidData/data7.zip similarity index 98% rename from project/jni/application/fheroes2/AndroidData/data6.zip rename to project/jni/application/fheroes2/AndroidData/data7.zip index d8666171a58003680ede9ff1b54ad72f4b8643d4..e7d77802b4ffe89fd05514bb79cca42a4b095a21 100644 GIT binary patch delta 4774 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 AnE(I) delta 3161 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