Replaced shared ICU libs with static - shared ones do not work because of exceptions

2014-03-13 21:17:34 +02:00
parent e28055c3ae
commit 3061223a9c
67 changed files with 27 additions and 10 deletions
@@ -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
 }
@@ -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
 	}

@@ -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

@@ -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
@@ -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
@@ -0,0 +1 @@
+icuuc
@@ -0,0 +1 @@
+icuuc
@@ -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)
@@ -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)