Removed sdl_fake_stdout hack - it prevents standalone executables to …

…link

ChangeAppSettings.sh

@@ -623,7 +623,7 @@ mv -f project/src/Globals.java.1 project/src/Globals.java
 echo Patching project/jni/Settings.mk
 echo '# DO NOT EDIT THIS FILE - it is automatically generated, edit file SettingsTemplate.mk' > project/jni/Settings.mk
 cat project/jni/SettingsTemplate.mk | \
-	sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport jpeg png ogg flac vorbis freetype sdl_fake_stdout $CompiledLibraries/" | \
+	sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport jpeg png ogg flac vorbis freetype $CompiledLibraries/" | \
 	sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" | \
 	sed "s/SDL_JAVA_PACKAGE_PATH := .*/SDL_JAVA_PACKAGE_PATH := $AppFullNameUnderscored/" | \
 	sed "s^SDL_CURDIR_PATH := .*^SDL_CURDIR_PATH := $DataPath^" | \

project/jni/application/Android.mk

@@ -33,8 +33,6 @@ LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
 					$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 					$(foreach L, $(COMPILED_LIBRARIES), $(LOCAL_PATH)/../$(L)/include) \
 
-LOCAL_CFLAGS += -include $(LOCAL_PATH)/../sdl_fake_stdout/include/SDL_android_printf.h
-
 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
 
 #Change C++ file extension as appropriate
@@ -48,11 +46,11 @@ LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION) $(filter-out $(APP_AVAILABLE_STATIC
 
 LOCAL_STATIC_LIBRARIES := $(filter $(APP_AVAILABLE_STATIC_LIBS), $(COMPILED_LIBRARIES))
 
-LOCAL_STATIC_LIBRARIES += stlport sdl_fake_stdout
+LOCAL_STATIC_LIBRARIES += stlport
 
 LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
-LOCAL_LDFLAGS := -Lobj/local/armeabi -Wl,-u,_SDL_ANDROID_initFakeStdout
+LOCAL_LDFLAGS := -Lobj/local/armeabi
 
 LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS)
 

project/jni/application/setEnvironment-r4b.sh

@@ -48,7 +48,6 @@ CFLAGS="-I$NDK/build/platforms/$PLATFORMVER/arch-arm/usr/include \
 -Wno-psabi -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -O2 \
 -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -Wa,--noexecstack -DNDEBUG -g \
--include $LOCAL_PATH/../sdl_fake_stdout/include/SDL_android_printf.h \
 -I$LOCAL_PATH/../sdl-1.2/include $STL_INCLUDE \
 `echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-I$LOCAL_PATH/../\1/include@g\"`"
 
@@ -62,7 +61,7 @@ $NDK/build/platforms/$PLATFORMVER/arch-arm/usr/lib/libm.so \
 -L$NDK/build/platforms/$PLATFORMVER/arch-arm/usr/lib \
 -lGLESv1_CM -ldl -llog -lz \
 -Wl,-rpath-link=$NDK/build/platforms/$PLATFORMVER/arch-arm/usr/lib \
--L$LOCAL_PATH/../../obj/local/armeabi $STL_LIB -lsdl_fake_stdout -Wl,-u,_SDL_ANDROID_initFakeStdout"
+-L$LOCAL_PATH/../../obj/local/armeabi $STL_LIB"
 
 env PATH=$NDK/build/prebuilt/$MYARCH/arm-eabi-$GCCVER/bin:$LOCAL_PATH:$PATH \
 CFLAGS="$CFLAGS" \

project/jni/application/setEnvironment-r5b.sh

@@ -47,15 +47,15 @@ done
 
 if [ -n "$CRYSTAX_WCHAR" ]; then
 	CRYSTAX_WCHAR_INCLUDE=-I$NDK/sources/wchar-support/include
-	CRYSTAX_WCHAR_LIB="$NDK/sources/wchar-support/libs/armeabi/libwchar_static.a"
+	CRYSTAX_WCHAR_LIB="-L$NDK/sources/wchar-support/libs/armeabi -lwchar_static"
 fi
 
 CFLAGS="\
 -fexceptions -frtti \
 -fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi \
 -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -I$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
--DANDROID -include $LOCAL_PATH/../sdl_fake_stdout/include/SDL_android_printf.h \
+-DANDROID \
 -DNDEBUG -O2 -g \
 -I$NDK/sources/cxx-stl/gnu-libstdc++/include \
 -I$NDK/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include \
@@ -77,7 +77,7 @@ $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libz.so \
 $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libstdc++.a \
 -L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
 -L$LOCAL_PATH/../../obj/local/armeabi -Wl,--no-undefined -Wl,-z,noexecstack \
--Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib -lsupc++ -lsdl_fake_stdout -Wl,-u,_SDL_ANDROID_initFakeStdout \
+-Wl,-rpath-link=$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib -lsupc++ \
 $CRYSTAX_WCHAR_LIB"
 
 env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \

project/jni/application/vcmi/AndroidBuild.sh

@@ -9,11 +9,17 @@ ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
 ln -sf libsdl_mixer.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so
 ln -sf libsdl_image.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_image.so
 ln -sf libsdl_ttf.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_ttf.so
+rm -f libapplication.so
+
+GCC_PREFIX=arm-eabi
+if echo $CXX | grep 'arm-linux-androideabi'; then
+	GCC_PREFIX=arm-linux-androideabi
+fi
 
 if [ \! -f vcmi/Makefile -o $0 -nt vcmi/Makefile ] ; then
 	../setEnvironment.sh sh -c "cd vcmi && \
 	env LIBS='-lavcodec -lavutil -lavcore -lgcc' \
-	./configure --host=arm-eabi --enable-static \
+	./configure --host=$GCC_PREFIX --enable-static \
 	--with-boost-system=boost_system \
 	--with-boost-filesystem=boost_filesystem \
 	--with-boost-thread=boost_thread \
@@ -24,10 +30,11 @@ fi
 ../setEnvironment.sh sh -c "cd vcmi && \
   make -j4 AM_DEFAULT_VERBOSITY=1 \
   pkgdatadir=. pkglibdir=/data/data/eu.vcmi/lib bindir=/data/data/eu.vcmi/lib" && \
-cp -f vcmi/client/vcmiclient libapplication.so &&
+cp -f vcmi/client/vcmiclient libapplication.so || exit 1
 
 rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
 rm -f $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
 rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so
 rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_image.so
 rm -f $LOCAL_PATH/../../../obj/local/armeabi/libSDL_ttf.so
+exit 0

project/jni/bzip2/Android.mk

@@ -5,15 +5,15 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := bzip2
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include
-LOCAL_CFLAGS := -O3 -D__sF=__SDL_fake_stdout
+LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
-LOCAL_STATIC_LIBRARIES := 
+LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES :=
 
 LOCAL_LDLIBS :=
 

project/jni/curl/Android.mk

@@ -49,8 +49,8 @@ LOCAL_PATH:= $(call my-dir)
 common_CFLAGS := \
 	-Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes \
 	-Wno-long-long -Wfloat-equal -Wno-multichar -Wsign-compare -Wno-format-nonliteral -Wendif-labels \
-	-Wstrict-prototypes -Wdeclaration-after-statement -Wno-system-headers -DHAVE_CONFIG_H -std=gnu99 \
-	-D__sF=__SDL_fake_stdout
+	-Wstrict-prototypes -Wdeclaration-after-statement -Wno-system-headers -DHAVE_CONFIG_H -std=gnu99
+
 
 #########################
 # Build the libcurl library
@@ -75,7 +75,7 @@ LOCAL_CFLAGS += $(common_CFLAGS)
 
 LOCAL_MODULE:= libcurl
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES :=
 
 LOCAL_LDLIBS := -lz
 

project/jni/fluidsynth/Android.mk

@@ -7,7 +7,7 @@ LOCAL_MODULE := fluidsynth
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
 LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
-LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -include stdint.h -Werror=implicit -D__sF=__SDL_fake_stdout
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -include stdint.h -Werror=implicit
 
 LOCAL_CPP_EXTENSION := .cpp
 

project/jni/intl/Android.mk

@@ -17,14 +17,13 @@ LOCAL_CFLAGS := -Os -DBUILDING_LIBINTL -DBUILDING_DLL \
                 -DLOCALEDIR=\"\" \
                 -DLIBDIR=\"\" \
                 -DLOCALE_ALIAS_PATH=\"\" \
-                -DINSTALLDIR=\"\" \
-                -D__sF=__SDL_fake_stdout
+                -DINSTALLDIR=\"\"
 
 # -DLOCALE_ALIAS_PATH=\"/usr/local/share/locale\" \
 #   -DINSTALLDIR=\"/usr/local/lib\"
 
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES :=
 
 include $(BUILD_SHARED_LIBRARY)

project/jni/lua/Android.mk

@@ -5,15 +5,15 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := lua
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include 
-LOCAL_CFLAGS := -O3 -D__sF=__SDL_fake_stdout
+LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(addprefix src/, $(notdir $(wildcard $(LOCAL_PATH)/src/*.c) $(wildcard $(LOCAL_PATH)/src/*.cpp)))
 
-LOCAL_STATIC_LIBRARIES := 
+LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
+LOCAL_SHARED_LIBRARIES :=
 
 LOCAL_LDLIBS :=
 

project/jni/sdl-1.3/src/video/android/SDL_androidvideo.c

@@ -272,8 +272,6 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInitJavaCallbacks) ( JNIEnv*  env, jobject t
 	JavaShowScreenKeyboard = (*JavaEnv)->GetMethodID(JavaEnv, JavaRendererClass, "showScreenKeyboard", "(Ljava/lang/String;I)V");
 
 	ANDROID_InitOSKeymap();
-
-	SDL_ANDROID_initFakeStdout();
 }
 
 int SDL_ANDROID_SetApplicationPutToBackgroundCallback(