diff --git a/project/jni/application/openttd-chillcore/AndroidAppSettings.cfg b/project/jni/application/openttd-chillcore/AndroidAppSettings.cfg deleted file mode 100644 index bbbd4f170..000000000 --- a/project/jni/application/openttd-chillcore/AndroidAppSettings.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# The application settings for Android libSDL port -AppSettingVersion=17 -LibSdlVersion=1.2 -AppName="OpenTTD ChillCore" -AppFullName=org.openttd.sdl.chillcore -ScreenOrientation=h -InhibitSuspend=n -AppDataDownloadUrl="!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-chillcore.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download" -SdlVideoResize=y -SdlVideoResizeKeepAspect=n -NeedDepthBuffer=n -SwVideoMode=y -AppUsesMouse=y -AppNeedsTwoButtonMouse=y -AppNeedsArrowKeys=n -AppNeedsTextInput=y -AppUsesJoystick=n -AppHandlesJoystickSensitivity=n -AppUsesMultitouch=n -NonBlockingSwapBuffers=n -RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE" -AppTouchscreenKeyboardKeysAmount=0 -AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" -MultiABI=n -AppVersionCode=10512 -AppVersionName="1.0.5.12" -CompiledLibraries="jpeg png freetype timidity lzma lzo2" -CustomBuildScript=y -AppCflags='' -AppLdflags='' -AppSubdirsBuild='' -AppCmdline='openttd -d 3' -ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/openttd-chillcore/AndroidBuild.sh b/project/jni/application/openttd-chillcore/AndroidBuild.sh deleted file mode 100755 index efdc0d0d1..000000000 --- a/project/jni/application/openttd-chillcore/AndroidBuild.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -LOCAL_PATH=`dirname $0` -LOCAL_PATH=`cd $LOCAL_PATH && pwd` - - -# Uncomment if your configure expects SDL libraries in form "libSDL_name.so" -#ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/armeabi/libvorbisidec.a -#ln -sf libflac.a $LOCAL_PATH/../../../obj/local/armeabi/libFLAC.a - -# 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" - 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" -fi -../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 STRIP='' 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-chillcore/icon.png b/project/jni/application/openttd-chillcore/icon.png deleted file mode 100644 index 607f06043..000000000 Binary files a/project/jni/application/openttd-chillcore/icon.png and /dev/null differ diff --git a/project/jni/application/openttd-chillcore/openttd b/project/jni/application/openttd-chillcore/openttd deleted file mode 120000 index 2fdf78a93..000000000 --- a/project/jni/application/openttd-chillcore/openttd +++ /dev/null @@ -1 +0,0 @@ -../../../../../openttd-chillcore \ No newline at end of file diff --git a/project/jni/application/openttd-chillcore/openttd-trunk-android.patch b/project/jni/application/openttd-chillcore/openttd-trunk-android.patch deleted file mode 100644 index 518de169b..000000000 --- a/project/jni/application/openttd-chillcore/openttd-trunk-android.patch +++ /dev/null @@ -1,218 +0,0 @@ -Index: src/video/sdl_v.cpp -=================================================================== ---- src/video/sdl_v.cpp (revision 21531) -+++ src/video/sdl_v.cpp (working copy) -@@ -353,6 +353,8 @@ - if (sym->scancode == 49) key = WKC_BACKSPACE; - #elif defined(__sgi__) - if (sym->scancode == 22) key = WKC_BACKQUOTE; -+#elif defined(ANDROID) -+ if (sym->scancode == SDLK_BACKQUOTE) key = WKC_BACKQUOTE; - #else - if (sym->scancode == 49) key = WKC_BACKQUOTE; - #endif -@@ -484,6 +486,9 @@ - SDL_CALL SDL_EnableUNICODE(1); - - _draw_threaded = GetDriverParam(parm, "no_threads") == NULL && GetDriverParam(parm, "no_thread") == NULL; -+#ifdef ANDROID -+ _draw_threaded = false; -+#endif - - return NULL; - } -Index: src/sound/sdl_s.cpp -=================================================================== ---- src/sound/sdl_s.cpp (revision 21531) -+++ src/sound/sdl_s.cpp (working copy) -@@ -20,9 +20,16 @@ - - static FSoundDriver_SDL iFSoundDriver_SDL; - -+#ifdef ANDROID -+extern void Android_MidiMixMusic(Sint16 *stream, int len); -+#endif -+ - static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) - { - MxMixSamples(stream, len / 4); -+#if defined(ANDROID) && defined(LIBTIMIDITY) -+ Android_MidiMixMusic((Sint16 *)stream, len / 2); -+#endif - } - - const char *SoundDriver_SDL::Start(const char * const *parm) -Index: src/music/libtimidity.cpp -=================================================================== ---- src/music/libtimidity.cpp (revision 21531) -+++ src/music/libtimidity.cpp (working copy) -@@ -22,10 +22,13 @@ - #include - #include - #include -+#include -+ - #if defined(PSP) - #include - #endif /* PSP */ - -+ - enum MidiState { - MIDI_STOPPED = 0, - MIDI_PLAYING = 1, -@@ -50,6 +53,24 @@ - } - } - #endif /* PSP */ -+#ifdef ANDROID -+#define MIN(X ,Y) ((X) < (Y) ? (X) : (Y)) -+void Android_MidiMixMusic(Sint16 *stream, int len) -+{ -+ if (_midi.status == MIDI_PLAYING) { -+ Sint16 buf[16384]; -+ while( len > 0 ) -+ { -+ int minlen = MIN(sizeof(buf), len); -+ mid_song_read_wave(_midi.song, stream, MIN(sizeof(buf), len*2)); -+ for( Uint16 i = 0; i < minlen; i++ ) -+ stream[i] += buf[i]; -+ stream += minlen; -+ len -= minlen; -+ } -+ } -+} -+#endif - - static FMusicDriver_LibTimidity iFMusicDriver_LibTimidity; - -Index: src/table/settings.h -=================================================================== ---- src/table/settings.h (revision 21531) -+++ src/table/settings.h (working copy) -@@ -269,9 +269,15 @@ - SDTG_STR("savegame_format", SLE_STRB, S, 0, _savegame_format, NULL, STR_NULL, NULL), - SDTG_BOOL("rightclick_emulate", S, 0, _rightclick_emulate, false, STR_NULL, NULL), - #ifdef WITH_FREETYPE -+#ifdef ANDROID -+ SDTG_STR("small_font", SLE_STRB, S, 0, _freetype.small_font, "fonts/FreeSans.ttf", STR_NULL, NULL), -+ SDTG_STR("medium_font", SLE_STRB, S, 0, _freetype.medium_font, "fonts/FreeSans.ttf", STR_NULL, NULL), -+ SDTG_STR("large_font", SLE_STRB, S, 0, _freetype.large_font, "fonts/FreeSerif.ttf", STR_NULL, NULL), -+#else - SDTG_STR("small_font", SLE_STRB, S, 0, _freetype.small_font, NULL, STR_NULL, NULL), - SDTG_STR("medium_font", SLE_STRB, S, 0, _freetype.medium_font, NULL, STR_NULL, NULL), - SDTG_STR("large_font", SLE_STRB, S, 0, _freetype.large_font, NULL, STR_NULL, NULL), -+#endif - SDTG_VAR("small_size", SLE_UINT, S, 0, _freetype.small_size, 8, 0, 72, 0, STR_NULL, NULL), - SDTG_VAR("medium_size", SLE_UINT, S, 0, _freetype.medium_size, 10, 0, 72, 0, STR_NULL, NULL), - SDTG_VAR("large_size", SLE_UINT, S, 0, _freetype.large_size, 16, 0, 72, 0, STR_NULL, NULL), -Index: src/os/unix/unix.cpp -=================================================================== ---- src/os/unix/unix.cpp (revision 21531) -+++ src/os/unix/unix.cpp (working copy) -@@ -24,7 +24,7 @@ - - #ifdef __APPLE__ - #include --#elif (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__) -+#elif ((defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) || defined(__GLIBC__)) && !defined(ANDROID) - #define HAS_STATVFS - #endif - -@@ -245,6 +245,11 @@ - void cocoaReleaseAutoreleasePool(); - #endif - -+#ifdef ANDROID -+#define main SDL_main -+extern "C" int CDECL main(int, char *[]); -+#endif -+ - int CDECL main(int argc, char *argv[]) - { - int ret; -Index: src/os/unix/crashlog_unix.cpp -=================================================================== ---- src/os/unix/crashlog_unix.cpp (revision 21531) -+++ src/os/unix/crashlog_unix.cpp (working copy) -@@ -141,7 +141,11 @@ - }; - - /** The signals we want our crash handler to handle. */ -+#ifdef ANDROID -+static const int _signals_to_handle[] = { }; // Default Android signal handler will give us stack trace -+#else - static const int _signals_to_handle[] = { SIGSEGV, SIGABRT, SIGFPE, SIGBUS, SIGILL }; -+#endif - - /** - * Entry point for the crash handler. -Index: src/window.cpp -=================================================================== ---- src/window.cpp (revision 21531) -+++ src/window.cpp (working copy) -@@ -2171,6 +2171,10 @@ - * But there is no company related window open anyway, so _current_company is not used. */ - assert(IsGeneratingWorld() || IsLocalCompany()); - -+#ifdef ANDROID -+ _settings_client.gui.left_mouse_btn_scrolling = true; -+#endif -+ - HandlePlacePresize(); - UpdateTileSelection(); - -Index: src/network/core/os_abstraction.h -=================================================================== ---- src/network/core/os_abstraction.h (revision 21531) -+++ src/network/core/os_abstraction.h (working copy) -@@ -161,7 +161,7 @@ - # include - /* According to glibc/NEWS, appeared in glibc-2.3. */ - # if !defined(__sgi__) && !defined(SUNOS) && !defined(__MORPHOS__) && !defined(__BEOS__) && !defined(__HAIKU__) && !defined(__INNOTEK_LIBC__) \ -- && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX) -+ && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX) && !defined(ANDROID) - /* If for any reason ifaddrs.h does not exist on your system, comment out - * the following two lines and an alternative way will be used to fetch - * the list of IPs from the system. */ -Index: src/viewport.cpp -=================================================================== -Index: src/debug.cpp -=================================================================== ---- src/debug.cpp (revision 21531) -+++ src/debug.cpp (working copy) -@@ -16,6 +16,9 @@ - #include "string_func.h" - #include "fileio_func.h" - #include "settings_type.h" -+#ifdef ANDROID -+#include -+#endif - - #include - -@@ -76,6 +79,9 @@ - */ - static void debug_print(const char *dbg, const char *buf) - { -+#ifdef ANDROID -+ __android_log_print(ANDROID_LOG_INFO, "OpenTTD", "[%s] %s", dbg, buf); -+#endif - #if defined(ENABLE_NETWORK) - if (_debug_socket != INVALID_SOCKET) { - char buf2[1024 + 32]; -Index: src/main_gui.cpp -=================================================================== ---- src/main_gui.cpp (revision 21531) -+++ src/main_gui.cpp (working copy) -@@ -465,7 +465,11 @@ - Hotkey('C', "center", GHK_CENTER), - Hotkey('Z', "center_zoom", GHK_CENTER_ZOOM), - Hotkey(WKC_ESC, "reset_object_to_place", GHK_RESET_OBJECT_TO_PLACE), -+#ifdef ANDROID -+ Hotkey(WKC_DELETE, "delete_windows", GHK_DELETE_NONVITAL_WINDOWS), -+#else - Hotkey(WKC_DELETE, "delete_windows", GHK_DELETE_WINDOWS), -+#endif - Hotkey(WKC_DELETE | WKC_SHIFT, "delete_all_windows", GHK_DELETE_NONVITAL_WINDOWS), - Hotkey('R' | WKC_CTRL, "refresh_screen", GHK_REFRESH_SCREEN), - #if defined(_DEBUG) diff --git a/project/jni/application/openttd-chillcore/readme.txt b/project/jni/application/openttd-chillcore/readme.txt deleted file mode 100644 index ab2fbb4ff..000000000 --- a/project/jni/application/openttd-chillcore/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -Quick compilation guide: -Download my GIT repo from https://github.com/pelya/commandergenius, -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 r21531 into the dir project/jni/application/openttd/openttd, -apply ChillCore patch onto it, apply my patch openttd-trunk-android.patch -and launch build.sh. That should be it. -There will be error with "sqrtl" function not defined, change it to "sqrt". \ No newline at end of file diff --git a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg b/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg deleted file mode 100644 index 598fe6e43..000000000 --- a/project/jni/application/openttd-lowmem/AndroidAppSettings.cfg +++ /dev/null @@ -1,34 +0,0 @@ -# The application settings for Android libSDL port -AppSettingVersion=16 -LibSdlVersion=1.2 -AppName="OpenTTD-lowmem" -AppFullName=org.openttd.sdl.lowmem -ScreenOrientation=h -InhibitSuspend=n -AppDataDownloadUrl="Data files - 6 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-lowmem-2.zip/download^Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095" -SdlVideoResize=y -SdlVideoResizeKeepAspect=n -NeedDepthBuffer=n -AppUsesMouse=y -AppNeedsTwoButtonMouse=y -AppNeedsArrowKeys=y -AppNeedsTextInput=y -AppUsesJoystick=n -AppHandlesJoystickSensitivity=n -AppUsesMultitouch=n -NonBlockingSwapBuffers=n -RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS DELETE" -AppTouchscreenKeyboardKeysAmount=0 -AppTouchscreenKeyboardKeysAmountAutoFire=0 -RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" -MultiABI=n -AppVersionCode=10510 -AppVersionName="1.0.5.10" -CompiledLibraries="png lzo2" -CustomBuildScript=y -AppCflags='' -AppLdflags='' -AppSubdirsBuild='' -AppUseCrystaXToolchain=y -AppCmdline='openttd -d 3 -b 8bpp-simple' -ReadmeText='^You may press "Home" now - the data will be downloaded in background' diff --git a/project/jni/application/openttd-lowmem/AndroidBuild.sh b/project/jni/application/openttd-lowmem/AndroidBuild.sh deleted file mode 100755 index 1db6c79e0..000000000 --- a/project/jni/application/openttd-lowmem/AndroidBuild.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -LOCAL_PATH=`dirname $0` -LOCAL_PATH=`cd $LOCAL_PATH && pwd` - - -# Uncomment if your configure expects SDL libraries in form "libSDL_name.so" -#ln -sf libtremor.a $LOCAL_PATH/../../../obj/local/armeabi/libvorbisidec.a -#ln -sf libflac.a $LOCAL_PATH/../../../obj/local/armeabi/libFLAC.a - -# 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" - rm -f openttd/Makefile -fi - -if [ \! -f openttd/Makefile ] ; then - ../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --without-freetype --with-png --with-zlib --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE" -fi -../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 LIBS='-lsdl-1.2 -llzo2 -lpng -lgcc -lz -lc -lstdc++'" && cp -f openttd/objs/release/openttd libapplication.so diff --git a/project/jni/application/openttd-lowmem/icon.png b/project/jni/application/openttd-lowmem/icon.png deleted file mode 100644 index 607f06043..000000000 Binary files a/project/jni/application/openttd-lowmem/icon.png and /dev/null differ diff --git a/project/jni/application/openttd-lowmem/openttd b/project/jni/application/openttd-lowmem/openttd deleted file mode 120000 index 2d882c54a..000000000 --- a/project/jni/application/openttd-lowmem/openttd +++ /dev/null @@ -1 +0,0 @@ -../../../../../openttd-1.0.5-lowmem \ No newline at end of file diff --git a/project/jni/application/openttd-lowmem/readme.txt b/project/jni/application/openttd-lowmem/readme.txt deleted file mode 100644 index 7c2db7865..000000000 --- a/project/jni/application/openttd-lowmem/readme.txt +++ /dev/null @@ -1 +0,0 @@ -The same as "openttd" package, but with sound and music disabled to save some RAM. diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 0178b4b70..53268dc2b 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -5,7 +5,7 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl ScreenOrientation=h InhibitSuspend=n -AppDataDownloadUrl="Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-5.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095" +AppDataDownloadUrl="!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-6.zip/download^!MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^!Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095" SdlVideoResize=y SdlVideoResizeKeepAspect=n NeedDepthBuffer=n @@ -22,9 +22,11 @@ RedefinedKeys="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE" AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2" +StartupMenuButtonTimeout=3000 +HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig' MultiABI=n -AppVersionCode=11013 -AppVersionName="1.1.0.13" +AppVersionCode=11113 +AppVersionName="1.1.1.13" CompiledLibraries="jpeg png freetype timidity lzma lzo2" CustomBuildScript=y AppCflags='' diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index efdc0d0d1..f1c3f5294 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -16,6 +16,6 @@ if [ \! -f openttd/objs/lang/english.lng ] ; then 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 --without-icu --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" fi ../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 STRIP='' 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 873bc88e7..b376b83e9 120000 --- a/project/jni/application/openttd/openttd +++ b/project/jni/application/openttd/openttd @@ -1 +1 @@ -../../../../../openttd-1.1.0 \ No newline at end of file +../../../../../openttd-1.1.1 \ No newline at end of file diff --git a/project/jni/application/openttd/openttd-trunk-android.patch b/project/jni/application/openttd/openttd-trunk-android.patch index d57adb4ac..b52f6e146 100644 --- a/project/jni/application/openttd/openttd-trunk-android.patch +++ b/project/jni/application/openttd/openttd-trunk-android.patch @@ -1,6 +1,6 @@ Index: src/video/sdl_v.cpp =================================================================== ---- src/video/sdl_v.cpp (revision 22294) +--- src/video/sdl_v.cpp (revision 22532) +++ src/video/sdl_v.cpp (working copy) @@ -353,6 +353,8 @@ if (sym->scancode == 49) key = WKC_BACKSPACE; @@ -23,7 +23,7 @@ Index: src/video/sdl_v.cpp } Index: src/sound/sdl_s.cpp =================================================================== ---- src/sound/sdl_s.cpp (revision 22294) +--- src/sound/sdl_s.cpp (revision 22532) +++ src/sound/sdl_s.cpp (working copy) @@ -20,9 +20,16 @@ @@ -44,7 +44,7 @@ Index: src/sound/sdl_s.cpp const char *SoundDriver_SDL::Start(const char * const *parm) Index: src/music/libtimidity.cpp =================================================================== ---- src/music/libtimidity.cpp (revision 22294) +--- src/music/libtimidity.cpp (revision 22532) +++ src/music/libtimidity.cpp (working copy) @@ -22,10 +22,13 @@ #include @@ -87,7 +87,7 @@ Index: src/music/libtimidity.cpp Index: src/table/settings.h =================================================================== ---- src/table/settings.h (revision 22294) +--- src/table/settings.h (revision 22532) +++ src/table/settings.h (working copy) @@ -270,9 +270,15 @@ SDTG_STR("savegame_format", SLE_STRB, S, 0, _savegame_format, NULL, STR_NULL, NULL), @@ -107,7 +107,7 @@ Index: src/table/settings.h SDTG_VAR("large_size", SLE_UINT, S, 0, _freetype.large_size, 16, 0, 72, 0, STR_NULL, NULL), Index: src/os/unix/unix.cpp =================================================================== ---- src/os/unix/unix.cpp (revision 22294) +--- src/os/unix/unix.cpp (revision 22532) +++ src/os/unix/unix.cpp (working copy) @@ -24,7 +24,7 @@ @@ -132,7 +132,7 @@ Index: src/os/unix/unix.cpp int ret; Index: src/os/unix/crashlog_unix.cpp =================================================================== ---- src/os/unix/crashlog_unix.cpp (revision 22294) +--- src/os/unix/crashlog_unix.cpp (revision 22532) +++ src/os/unix/crashlog_unix.cpp (working copy) @@ -141,7 +141,11 @@ }; @@ -148,9 +148,9 @@ Index: src/os/unix/crashlog_unix.cpp * Entry point for the crash handler. Index: src/window.cpp =================================================================== ---- src/window.cpp (revision 22294) +--- src/window.cpp (revision 22532) +++ src/window.cpp (working copy) -@@ -2158,6 +2158,10 @@ +@@ -2159,6 +2159,10 @@ * But there is no company related window open anyway, so _current_company is not used. */ assert(IsGeneratingWorld() || IsLocalCompany()); @@ -163,7 +163,7 @@ Index: src/window.cpp Index: src/network/core/os_abstraction.h =================================================================== ---- src/network/core/os_abstraction.h (revision 22294) +--- src/network/core/os_abstraction.h (revision 22532) +++ src/network/core/os_abstraction.h (working copy) @@ -161,7 +161,7 @@ # include @@ -176,7 +176,7 @@ Index: src/network/core/os_abstraction.h * the list of IPs from the system. */ Index: src/debug.cpp =================================================================== ---- src/debug.cpp (revision 22294) +--- src/debug.cpp (revision 22532) +++ src/debug.cpp (working copy) @@ -16,6 +16,9 @@ #include "string_func.h" @@ -200,7 +200,7 @@ Index: src/debug.cpp char buf2[1024 + 32]; Index: src/main_gui.cpp =================================================================== ---- src/main_gui.cpp (revision 22294) +--- src/main_gui.cpp (revision 22532) +++ src/main_gui.cpp (working copy) @@ -462,7 +462,11 @@ Hotkey('C', "center", GHK_CENTER), diff --git a/project/jni/application/openttd/readme.txt b/project/jni/application/openttd/readme.txt index 8de2ac2e7..c9fcae7a1 100644 --- a/project/jni/application/openttd/readme.txt +++ b/project/jni/application/openttd/readme.txt @@ -5,6 +5,6 @@ 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.1.0 into the dir project/jni/application/openttd/openttd +then download OpenTTD 1.1.1 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. diff --git a/project/jni/application/src b/project/jni/application/src index 104f796a6..550b7b622 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -ballfield \ No newline at end of file +openttd \ No newline at end of file