diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index f1086f51a..0296f085d 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -2,10 +2,10 @@ AppSettingVersion=15 LibSdlVersion=1.2 AppName="Free Heroes 2" -AppFullName=com.googlecode.fheroes2 +AppFullName=net.sourceforge.fheroes2 ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Game data|keys.zip" +AppDataDownloadUrl="Game data|data.zip^MIDI music support|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n @@ -23,9 +23,9 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0 MultiABI=n AppVersionCode=100 AppVersionName="1.0.0" -CompiledLibraries="sdl_net sdl_mixer sdl_image png" +CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n -AppCflags='-fexceptions -finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_NET -DWITH_XML -DWITH_IMAGE' +AppCflags='-fexceptions -finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_NET -DWITH_XML -DWITH_IMAGE -DWITH_TTF' AppLdflags='' AppSubdirsBuild='' AppUseCrystaXToolchain=y diff --git a/project/jni/application/fheroes2/AndroidData/data.zip b/project/jni/application/fheroes2/AndroidData/data.zip new file mode 100644 index 000000000..9926c2b81 Binary files /dev/null and b/project/jni/application/fheroes2/AndroidData/data.zip differ diff --git a/project/jni/application/fheroes2/AndroidData/keys.zip b/project/jni/application/fheroes2/AndroidData/keys.zip deleted file mode 100644 index 71de3e2e6..000000000 Binary files a/project/jni/application/fheroes2/AndroidData/keys.zip and /dev/null differ diff --git a/project/jni/application/fheroes2/icon.png b/project/jni/application/fheroes2/icon.png index 530187875..9a333fd77 100644 Binary files a/project/jni/application/fheroes2/icon.png and b/project/jni/application/fheroes2/icon.png differ diff --git a/readme.txt b/readme.txt index ca523700c..28145e75c 100644 --- a/readme.txt +++ b/readme.txt @@ -136,6 +136,8 @@ will most probably fail because of ranlib - just edit Android.mk to compile lib MIDI support can be emulated via SDL_mixer lib (it uses Timidity internally)- download file http://www.libsdl.org/projects/mixer/timidity/timidity.tar.gz unpack it and put "timidity" dir into your game data zipfile. +Or you may specify this URL directly as an optional download for ChangeAppSettings.sh: +http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download The ARM architecture has some limitations which you have to be aware about - if you'll access integer that's not 4-byte aligned you'll get garbage instead of correct value,