diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index 2ee40e8ec..ed6e4f899 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|data.zip^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download" +AppDataDownloadUrl="Game data|data.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n diff --git a/project/jni/application/fheroes2/src/fheroes2/game/fheroes2.cpp b/project/jni/application/fheroes2/src/fheroes2/game/fheroes2.cpp index dad297df8..17f8b1789 100644 --- a/project/jni/application/fheroes2/src/fheroes2/game/fheroes2.cpp +++ b/project/jni/application/fheroes2/src/fheroes2/game/fheroes2.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "gamedefs.h" #include "engine.h" @@ -69,11 +70,11 @@ std::string GetCaption(void) int main(int argc, char **argv) { + VERBOSE("Free Heroes II, " + conf.BuildVersion()); Settings & conf = Settings::Get(); int test = 0; std::cout << "Free Heroes II, " + conf.BuildVersion() << std::endl; - VERBOSE("Free Heroes II, " + conf.BuildVersion()); LoadConfigFiles(conf, GetDirname(argv[0])); diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index e5d8b4919..279512ea0 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -29,5 +29,5 @@ AppCflags='' AppLdflags='' AppSubdirsBuild='' AppUseCrystaXToolchain=y -AppCmdline='openttd' +AppCmdline='openttd -d 3' ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 5bf2857c5..39352727a 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -11,11 +11,11 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd` # OpenTTD build system is uglier than war. if [ \! -f openttd/objs/lang/english.lng ] ; then - sh -c "cd openttd && ./configure --without-freetype --without-png --without-zlib --without-lzo2 --endian=LE && make lang && make -C objs/release endian_target.h depend" + sh -c "cd openttd && ./configure --without-freetype --without-png --without-zlib --without-lzo2 --without-lzma --endian=LE && make lang && make -C objs/release endian_target.h depend" rm -f openttd/Makefile fi if [ \! -f openttd/Makefile ] ; then - ../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE" + ../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE --with-lzma=sdl-config" fi ../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -lgcc -lz -lc -lstdc++'" && cp -f openttd/objs/release/openttd libapplication.so diff --git a/project/jni/application/openttd/openttd b/project/jni/application/openttd/openttd index e93e19f0c..c46ce4425 120000 --- a/project/jni/application/openttd/openttd +++ b/project/jni/application/openttd/openttd @@ -1 +1 @@ -../../../../../openttd-1.0.4 \ No newline at end of file +../../../../../openttd-1.0.5 \ No newline at end of file diff --git a/project/jni/application/openttd/readme.txt b/project/jni/application/openttd/readme.txt index 376abdbc6..271ba27d2 100644 --- a/project/jni/application/openttd/readme.txt +++ b/project/jni/application/openttd/readme.txt @@ -4,7 +4,7 @@ then install Android SDK 2.2, NDK r4b, and "ant" tool, then launch commands rm project/jni/application/src ln -s scummvm project/jni/application/src cd project && android update project -p . -then download OpenTTD 1.0.4 into the dir project/jni/application/openttd/openttd +then download OpenTTD 1.0.5 into the dir project/jni/application/openttd/openttd (or create a symlink to it if you already have downloaded it), then apply patch openttd-trunk-android.patch and launch build.sh. That should be it. If you want to build OpenTTD trunk you should add line "--with-lzma=sdl-config" to "configure" parameters. \ No newline at end of file diff --git a/project/jni/application/src b/project/jni/application/src index 550b7b622..59d41f41e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -openttd \ No newline at end of file +fheroes2 \ No newline at end of file