diff --git a/project/java/Globals.java b/project/java/Globals.java index 1034b2851..d5449bbfa 100644 --- a/project/java/Globals.java +++ b/project/java/Globals.java @@ -129,5 +129,7 @@ class Globals public static boolean BrokenLibCMessageShown = false; // Gyroscope calibration public static float gyro_x1, gyro_x2, gyro_xc, gyro_y1, gyro_y2, gyro_yc, gyro_z1, gyro_z2, gyro_zc; + public static boolean OuyaEmulation = false; // For debugging + public static boolean RedirectStdout = false; // For debugging } diff --git a/project/java/Video.java b/project/java/Video.java index 53ce4da82..b032f96e6 100644 --- a/project/java/Video.java +++ b/project/java/Video.java @@ -664,7 +664,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer nativeInit( Globals.DataDir, Globals.CommandLine, ( (Globals.SwVideoMode && Globals.MultiThreadedVideo) || Globals.CompatibilityHacksVideo ) ? 1 : 0, - android.os.Debug.isDebuggerConnected() ? 1 : 0 ); + Globals.RedirectStdout ? 1 : 0 ); System.exit(0); // The main() returns here - I don't bother with deinit stuff, just terminate process } diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index 81fa2d14c..6e956704a 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -3,7 +3,7 @@ APP_MODULES := application sdl-1.2 sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype tremor ogg # To filter out static libs from all libs in makefile -APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread boost_locale glu +APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread boost_locale glu icudata icutest icui18n icuio icule iculx icutu icuuc APP_ABI := armeabi diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index 31b15276e..1d31c90fb 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -18,7 +18,7 @@ AppVersionName="1.4.0.27" # 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="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-1.3.3.zip/download^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Config file|:.openttd/openttd.cfg:openttd-1.3.0.25.cfg^!!Internationalization files|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip/download" +AppDataDownloadUrl="!!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-1.4.0-beta5.zip/download^!MIDI music support (18 Mb)|timidity.zip|http://sourceforge.net/projects/libsdl-android/files/timidity.zip^!!Config file|:.openttd/openttd.cfg:openttd-1.3.0.25.cfg^!!Internationalization files|http://sourceforge.net/projects/libsdl-android/files/icudt52l.zip/download" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=n @@ -71,7 +71,7 @@ CreateService= CompatibilityHacks=n # Application initializes SDL audio/video inside static constructors (which is bad, you won't be able to run ndk-gdb) (y)/(n) -CompatibilityHacksStaticInit=n +CompatibilityHacksStaticInit=y # On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n) CompatibilityHacksTextInputEmulatesHwKeyboard=n @@ -209,7 +209,7 @@ AppMinimumRAM=0 # Optional shared libraries to compile - removing some of them will save space # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 -CompiledLibraries="jpeg png freetype timidity lzma lzo2 icule iculx icui18n icuuc" +CompiledLibraries="jpeg png freetype timidity lzma lzo2 icui18n iculx icule icudata icuuc" # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) CustomBuildScript=y diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh index 0be536b4e..0807ef1a2 100755 --- a/project/jni/application/openttd/AndroidBuild.sh +++ b/project/jni/application/openttd/AndroidBuild.sh @@ -21,4 +21,4 @@ export ARCH=$1 if [ \! -f openttd-$VER-$1/Makefile ] ; then ../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && env ./configure --host=$2 --with-sdl --with-freetype=sdl-config --with-png --with-zlib --with-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 --with-lzma --endian=LE || echo 'Run: sudo apt-get install liblzma-dev - it is needed only for configure script'" fi -../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -licule -liculx -licui18n -licuuc -lgcc -lz -lc -lgnustl_static -lsupc++'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so +../setEnvironment-$1.sh sh -c "cd openttd-$VER-$1 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -licui18n -liculx -licule -licuuc -licudata -lgcc -lz -lc -lgnustl_static -lsupc++'" && cp -f openttd-$VER-$1/objs/release/openttd libapplication-$1.so diff --git a/project/jni/iconv/src b/project/jni/iconv/src index 929820fb5..5a97b64d1 160000 --- a/project/jni/iconv/src +++ b/project/jni/iconv/src @@ -1 +1 @@ -Subproject commit 929820fb511d236fe80a0ee7cc9f0d6ee84c99ed +Subproject commit 5a97b64d12298870cb736af20367cfec6908b22f diff --git a/project/jni/icudata b/project/jni/icudata new file mode 120000 index 000000000..4e0a43819 --- /dev/null +++ b/project/jni/icudata @@ -0,0 +1 @@ +icuuc \ No newline at end of file diff --git a/project/jni/icutest b/project/jni/icutest new file mode 120000 index 000000000..4e0a43819 --- /dev/null +++ b/project/jni/icutest @@ -0,0 +1 @@ +icuuc \ No newline at end of file diff --git a/project/jni/icuuc/Android.mk b/project/jni/icuuc/Android.mk index 2bcda5b00..89dc92c34 100644 --- a/project/jni/icuuc/Android.mk +++ b/project/jni/icuuc/Android.mk @@ -6,6 +6,10 @@ LOCAL_MODULE := $(notdir $(LOCAL_PATH)) LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so +LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a -include $(PREBUILT_SHARED_LIBRARY) +# NDK doesn't add the explicit dependency +obj/local/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a: $(LOCAL_PATH)/$(LOCAL_SRC_FILES) + cp -f $< $@ + +include $(PREBUILT_STATIC_LIBRARY) diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicudata.a b/project/jni/icuuc/lib/armeabi-v7a/libicudata.a new file mode 100755 index 000000000..1448b057f Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicudata.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicui18n.a b/project/jni/icuuc/lib/armeabi-v7a/libicui18n.a new file mode 100755 index 000000000..d6d8c3316 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicui18n.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicui18n.so b/project/jni/icuuc/lib/armeabi-v7a/libicui18n.so deleted file mode 100755 index e10960481..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libicui18n.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicuio.a b/project/jni/icuuc/lib/armeabi-v7a/libicuio.a new file mode 100755 index 000000000..d8c7a6111 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicuio.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicuio.so b/project/jni/icuuc/lib/armeabi-v7a/libicuio.so deleted file mode 100755 index 957168355..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libicuio.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicule.a b/project/jni/icuuc/lib/armeabi-v7a/libicule.a new file mode 100755 index 000000000..038b9912d Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicule.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicule.so b/project/jni/icuuc/lib/armeabi-v7a/libicule.so deleted file mode 100755 index c2cf2ee73..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libicule.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libiculx.a b/project/jni/icuuc/lib/armeabi-v7a/libiculx.a new file mode 100755 index 000000000..00561ee13 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libiculx.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libiculx.so b/project/jni/icuuc/lib/armeabi-v7a/libiculx.so deleted file mode 100755 index cc20ee1dd..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libiculx.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicutest.a b/project/jni/icuuc/lib/armeabi-v7a/libicutest.a new file mode 100755 index 000000000..977959fe0 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicutest.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicutu.a b/project/jni/icuuc/lib/armeabi-v7a/libicutu.a new file mode 100755 index 000000000..6abb79597 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicutu.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicutu.so b/project/jni/icuuc/lib/armeabi-v7a/libicutu.so deleted file mode 100755 index 8ee4c3cf1..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libicutu.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicuuc.a b/project/jni/icuuc/lib/armeabi-v7a/libicuuc.a new file mode 100755 index 000000000..d8db97b12 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi-v7a/libicuuc.a differ diff --git a/project/jni/icuuc/lib/armeabi-v7a/libicuuc.so b/project/jni/icuuc/lib/armeabi-v7a/libicuuc.so deleted file mode 100755 index 8a33962a4..000000000 Binary files a/project/jni/icuuc/lib/armeabi-v7a/libicuuc.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libicudata.a b/project/jni/icuuc/lib/armeabi/libicudata.a new file mode 100755 index 000000000..bccb43cb9 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicudata.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicui18n.a b/project/jni/icuuc/lib/armeabi/libicui18n.a new file mode 100755 index 000000000..2e660d588 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicui18n.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicui18n.so b/project/jni/icuuc/lib/armeabi/libicui18n.so deleted file mode 100755 index a239744f5..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libicui18n.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libicuio.a b/project/jni/icuuc/lib/armeabi/libicuio.a new file mode 100755 index 000000000..bb5633b95 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicuio.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicuio.so b/project/jni/icuuc/lib/armeabi/libicuio.so deleted file mode 100755 index 560a9c341..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libicuio.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libicule.a b/project/jni/icuuc/lib/armeabi/libicule.a new file mode 100755 index 000000000..72ad95102 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicule.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicule.so b/project/jni/icuuc/lib/armeabi/libicule.so deleted file mode 100755 index cf469c397..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libicule.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libiculx.a b/project/jni/icuuc/lib/armeabi/libiculx.a new file mode 100755 index 000000000..1010700f5 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libiculx.a differ diff --git a/project/jni/icuuc/lib/armeabi/libiculx.so b/project/jni/icuuc/lib/armeabi/libiculx.so deleted file mode 100755 index 741204422..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libiculx.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libicutest.a b/project/jni/icuuc/lib/armeabi/libicutest.a new file mode 100755 index 000000000..1c56abb76 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicutest.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicutu.a b/project/jni/icuuc/lib/armeabi/libicutu.a new file mode 100755 index 000000000..ed60272a6 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicutu.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicutu.so b/project/jni/icuuc/lib/armeabi/libicutu.so deleted file mode 100755 index 0d1bbe7bc..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libicutu.so and /dev/null differ diff --git a/project/jni/icuuc/lib/armeabi/libicuuc.a b/project/jni/icuuc/lib/armeabi/libicuuc.a new file mode 100755 index 000000000..d72295105 Binary files /dev/null and b/project/jni/icuuc/lib/armeabi/libicuuc.a differ diff --git a/project/jni/icuuc/lib/armeabi/libicuuc.so b/project/jni/icuuc/lib/armeabi/libicuuc.so deleted file mode 100755 index 2a18432a4..000000000 Binary files a/project/jni/icuuc/lib/armeabi/libicuuc.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libicudata.a b/project/jni/icuuc/lib/mips/libicudata.a new file mode 100755 index 000000000..0bcb3b210 Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicudata.a differ diff --git a/project/jni/icuuc/lib/mips/libicui18n.a b/project/jni/icuuc/lib/mips/libicui18n.a new file mode 100755 index 000000000..e631977b4 Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicui18n.a differ diff --git a/project/jni/icuuc/lib/mips/libicui18n.so b/project/jni/icuuc/lib/mips/libicui18n.so deleted file mode 100755 index ae1502e71..000000000 Binary files a/project/jni/icuuc/lib/mips/libicui18n.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libicuio.a b/project/jni/icuuc/lib/mips/libicuio.a new file mode 100755 index 000000000..5129d4e39 Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicuio.a differ diff --git a/project/jni/icuuc/lib/mips/libicuio.so b/project/jni/icuuc/lib/mips/libicuio.so deleted file mode 100755 index 0a3e0f244..000000000 Binary files a/project/jni/icuuc/lib/mips/libicuio.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libicule.a b/project/jni/icuuc/lib/mips/libicule.a new file mode 100755 index 000000000..506e1570b Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicule.a differ diff --git a/project/jni/icuuc/lib/mips/libicule.so b/project/jni/icuuc/lib/mips/libicule.so deleted file mode 100755 index 394609570..000000000 Binary files a/project/jni/icuuc/lib/mips/libicule.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libiculx.a b/project/jni/icuuc/lib/mips/libiculx.a new file mode 100755 index 000000000..d0a70785c Binary files /dev/null and b/project/jni/icuuc/lib/mips/libiculx.a differ diff --git a/project/jni/icuuc/lib/mips/libiculx.so b/project/jni/icuuc/lib/mips/libiculx.so deleted file mode 100755 index c8084eb71..000000000 Binary files a/project/jni/icuuc/lib/mips/libiculx.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libicutest.a b/project/jni/icuuc/lib/mips/libicutest.a new file mode 100755 index 000000000..b873ef6e7 Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicutest.a differ diff --git a/project/jni/icuuc/lib/mips/libicutu.a b/project/jni/icuuc/lib/mips/libicutu.a new file mode 100755 index 000000000..588c209aa Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicutu.a differ diff --git a/project/jni/icuuc/lib/mips/libicutu.so b/project/jni/icuuc/lib/mips/libicutu.so deleted file mode 100755 index ff7058634..000000000 Binary files a/project/jni/icuuc/lib/mips/libicutu.so and /dev/null differ diff --git a/project/jni/icuuc/lib/mips/libicuuc.a b/project/jni/icuuc/lib/mips/libicuuc.a new file mode 100755 index 000000000..623a16a58 Binary files /dev/null and b/project/jni/icuuc/lib/mips/libicuuc.a differ diff --git a/project/jni/icuuc/lib/mips/libicuuc.so b/project/jni/icuuc/lib/mips/libicuuc.so deleted file mode 100755 index 35654601c..000000000 Binary files a/project/jni/icuuc/lib/mips/libicuuc.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libicudata.a b/project/jni/icuuc/lib/x86/libicudata.a new file mode 100755 index 000000000..a325f87af Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicudata.a differ diff --git a/project/jni/icuuc/lib/x86/libicui18n.a b/project/jni/icuuc/lib/x86/libicui18n.a new file mode 100755 index 000000000..16d3f952f Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicui18n.a differ diff --git a/project/jni/icuuc/lib/x86/libicui18n.so b/project/jni/icuuc/lib/x86/libicui18n.so deleted file mode 100755 index 18c1ca4cf..000000000 Binary files a/project/jni/icuuc/lib/x86/libicui18n.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libicuio.a b/project/jni/icuuc/lib/x86/libicuio.a new file mode 100755 index 000000000..2135fae99 Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicuio.a differ diff --git a/project/jni/icuuc/lib/x86/libicuio.so b/project/jni/icuuc/lib/x86/libicuio.so deleted file mode 100755 index 0af4e3b33..000000000 Binary files a/project/jni/icuuc/lib/x86/libicuio.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libicule.a b/project/jni/icuuc/lib/x86/libicule.a new file mode 100755 index 000000000..9fdb1b032 Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicule.a differ diff --git a/project/jni/icuuc/lib/x86/libicule.so b/project/jni/icuuc/lib/x86/libicule.so deleted file mode 100755 index d9a3899c0..000000000 Binary files a/project/jni/icuuc/lib/x86/libicule.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libiculx.a b/project/jni/icuuc/lib/x86/libiculx.a new file mode 100755 index 000000000..d0f501aa7 Binary files /dev/null and b/project/jni/icuuc/lib/x86/libiculx.a differ diff --git a/project/jni/icuuc/lib/x86/libiculx.so b/project/jni/icuuc/lib/x86/libiculx.so deleted file mode 100755 index c25a60e07..000000000 Binary files a/project/jni/icuuc/lib/x86/libiculx.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libicutest.a b/project/jni/icuuc/lib/x86/libicutest.a new file mode 100755 index 000000000..6d2577b0c Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicutest.a differ diff --git a/project/jni/icuuc/lib/x86/libicutu.a b/project/jni/icuuc/lib/x86/libicutu.a new file mode 100755 index 000000000..821168d15 Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicutu.a differ diff --git a/project/jni/icuuc/lib/x86/libicutu.so b/project/jni/icuuc/lib/x86/libicutu.so deleted file mode 100755 index cea3b2ac3..000000000 Binary files a/project/jni/icuuc/lib/x86/libicutu.so and /dev/null differ diff --git a/project/jni/icuuc/lib/x86/libicuuc.a b/project/jni/icuuc/lib/x86/libicuuc.a new file mode 100755 index 000000000..9fce62769 Binary files /dev/null and b/project/jni/icuuc/lib/x86/libicuuc.a differ diff --git a/project/jni/icuuc/lib/x86/libicuuc.so b/project/jni/icuuc/lib/x86/libicuuc.so deleted file mode 100755 index a1ccc6d85..000000000 Binary files a/project/jni/icuuc/lib/x86/libicuuc.so and /dev/null differ diff --git a/project/jni/icuuc/src b/project/jni/icuuc/src index 929820fb5..5a97b64d1 160000 --- a/project/jni/icuuc/src +++ b/project/jni/icuuc/src @@ -1 +1 @@ -Subproject commit 929820fb511d236fe80a0ee7cc9f0d6ee84c99ed +Subproject commit 5a97b64d12298870cb736af20367cfec6908b22f diff --git a/project/jni/sdl_main/sdl_main.c b/project/jni/sdl_main/sdl_main.c index d61e83a19..66619aabb 100644 --- a/project/jni/sdl_main/sdl_main.c +++ b/project/jni/sdl_main/sdl_main.c @@ -44,6 +44,12 @@ jobject SDL_ANDROID_JniVideoObject() return static_thiz; } +void redirectStdout() +{ + freopen( "stdout.log", "w", stdout ); + dup2( fileno(stdout), fileno(stderr) ); +} + #if SDL_VERSION_ATLEAST(1,3,0) #else extern void SDL_ANDROID_MultiThreadedVideoLoopInit(); @@ -87,6 +93,9 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring setenv("HOME", curdir, 1); __android_log_print(ANDROID_LOG_INFO, "libSDL", "Changing curdir to \"%s\"", curdir); + if( waitForDebugger ) + redirectStdout(); + jstr = (*env)->GetStringUTFChars(env, cmdline, NULL); if (jstr != NULL && strlen(jstr) > 0)