From a4cb94028c8aac24285ade2a6ed540da76dd5508 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Wed, 2 Feb 2011 14:28:16 +0000
Subject: [PATCH] Moved all includes from LOCAL_CFLAGS to LOCAL_C_INCLUDES so
 it will work in Cygwin

---
 project/jni/application/Android.mk  | 12 +++++++-----
 project/jni/curl/Android.mk         |  4 ++--
 project/jni/flac/Android.mk         |  3 ++-
 project/jni/fluidsynth/Android.mk   |  7 ++-----
 project/jni/freetype/Android.mk     |  4 ++--
 project/jni/intl/Android.mk         |  3 ++-
 project/jni/jpeg/Android.mk         |  4 ++--
 project/jni/lua/Android.mk          |  3 ++-
 project/jni/lzma/Android.mk         |  4 ++--
 project/jni/lzo2/Android.mk         |  4 ++--
 project/jni/mad/Android.mk          |  3 ++-
 project/jni/mikmod/Android.mk       |  4 ++--
 project/jni/ogg/Android.mk          |  3 ++-
 project/jni/openal/Android.mk       |  4 ++--
 project/jni/sdl-1.3/Android.mk      |  3 ++-
 project/jni/sdl_blitpool/Android.mk |  3 ++-
 project/jni/sdl_gfx/Android.mk      |  4 ++--
 project/jni/sdl_image/Android.mk    |  4 ++--
 project/jni/sdl_main/Android.mk     |  5 ++---
 project/jni/sdl_mixer/Android.mk    | 14 ++++++++------
 project/jni/sdl_net/Android.mk      |  3 ++-
 project/jni/sdl_ttf/Android.mk      |  3 ++-
 project/jni/stlport/Android.mk      |  3 ++-
 project/jni/theora/Android.mk       |  3 ++-
 project/jni/timidity/Android.mk     |  4 ++--
 project/jni/tremor/Android.mk       |  3 ++-
 project/jni/vorbis/Android.mk       |  3 ++-
 project/jni/xerces/Android.mk       | 11 ++++++-----
 project/jni/xml2/Android.mk         |  3 ++-
 project/jni/zzip/Android.mk         |  5 +++--
 readme.txt                          | 26 ++++++++++----------------
 31 files changed, 86 insertions(+), 76 deletions(-)

diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 83014ff94..8301b357b 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -15,15 +15,17 @@ APP_SUBDIRS := $(APPLICATION_SUBDIRS_BUILD_NONRECURSIVE) $(APPLICATION_SUBDIRS_B
 endif
 
 LOCAL_CFLAGS :=
+LOCAL_C_INCLUDES :=
 
 ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/../stlport/stlport
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport
 endif
 
-LOCAL_CFLAGS += $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
-				$(foreach L, $(COMPILED_LIBRARIES), -I$(LOCAL_PATH)/../$(L)/include) \
-				-D__sF=__SDL_fake_stdout
+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 += -D__sF=__SDL_fake_stdout
 
 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
 
diff --git a/project/jni/curl/Android.mk b/project/jni/curl/Android.mk
index 2cc585e88..3a927d8dd 100644
--- a/project/jni/curl/Android.mk
+++ b/project/jni/curl/Android.mk
@@ -50,7 +50,7 @@ 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 \
-	-I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/include/curl -I$(LOCAL_PATH)/lib -D__sF=__SDL_fake_stdout
+	-D__sF=__SDL_fake_stdout
 
 #########################
 # Build the libcurl library
@@ -70,7 +70,7 @@ CURL_HEADERS := \
 	types.h
 
 LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/include/curl $(LOCAL_PATH)/lib
 LOCAL_CFLAGS += $(common_CFLAGS)
 
 LOCAL_MODULE:= libcurl
diff --git a/project/jni/flac/Android.mk b/project/jni/flac/Android.mk
index 11e5db6cb..c16e531b6 100644
--- a/project/jni/flac/Android.mk
+++ b/project/jni/flac/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := flac
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS -I$(LOCAL_PATH)/../ogg/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/src/include $(LOCAL_PATH) $(LOCAL_PATH)/../ogg/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS
 
 ifeq "$(TARGET_ARCH_ABI)" "armeabi"
 LOCAL_CFLAGS += -DFLAC__INTEGER_ONLY_LIBRARY
diff --git a/project/jni/fluidsynth/Android.mk b/project/jni/fluidsynth/Android.mk
index a7c003f41..44c09b525 100644
--- a/project/jni/fluidsynth/Android.mk
+++ b/project/jni/fluidsynth/Android.mk
@@ -6,11 +6,8 @@ LOCAL_MODULE := fluidsynth
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DHAVE_CONFIG_H -include stdint.h -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
-				-Werror=implicit -D__sF=__SDL_fake_stdout
-
-
+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_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/freetype/Android.mk b/project/jni/freetype/Android.mk
index 05bc77555..a6cb8f39b 100644
--- a/project/jni/freetype/Android.mk
+++ b/project/jni/freetype/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := freetype
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -Os $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -Os -DFT2_BUILD_LIBRARY
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/intl/Android.mk b/project/jni/intl/Android.mk
index 56cd9811c..c8bda1fea 100644
--- a/project/jni/intl/Android.mk
+++ b/project/jni/intl/Android.mk
@@ -8,7 +8,8 @@ APP_SUBDIRS := src
 
 # Add more subdirs here, like src/subdir1 src/subdir2
 
-LOCAL_CFLAGS := -Os -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -DBUILDING_LIBINTL -DBUILDING_DLL \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include 
+LOCAL_CFLAGS := -Os -DBUILDING_LIBINTL -DBUILDING_DLL \
                 -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY \
                 -Dset_relocation_prefix=libintl_set_relocation_prefix \
                 -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 \
diff --git a/project/jni/jpeg/Android.mk b/project/jni/jpeg/Android.mk
index e0e2ae778..3e7a4d347 100644
--- a/project/jni/jpeg/Android.mk
+++ b/project/jni/jpeg/Android.mk
@@ -28,9 +28,9 @@ else
 LOCAL_SRC_FILES += jidctint.c jidctfst.S
 endif
 
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/include -DAVOID_TABLES 
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_CFLAGS += -DAVOID_TABLES
 LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-#LOCAL_CFLAGS += -march=armv6j
 
 LOCAL_MODULE:= jpeg
 
diff --git a/project/jni/lua/Android.mk b/project/jni/lua/Android.mk
index 861d1f735..3e9940c19 100644
--- a/project/jni/lua/Android.mk
+++ b/project/jni/lua/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := lua
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -D__sF=__SDL_fake_stdout
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src $(LOCAL_PATH)/include 
+LOCAL_CFLAGS := -O3 -D__sF=__SDL_fake_stdout
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/lzma/Android.mk b/project/jni/lzma/Android.mk
index c793f8411..24ea1ff15 100644
--- a/project/jni/lzma/Android.mk
+++ b/project/jni/lzma/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := lzma
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DHAVE_CONFIG_H -DTUKLIB_SYMBOL_PREFIX=lzma_ -std=c99 # Enable "restrict" keyword
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DTUKLIB_SYMBOL_PREFIX=lzma_ -std=c99 # Enable "restrict" keyword
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/lzo2/Android.mk b/project/jni/lzo2/Android.mk
index 299f995af..5a4900947 100644
--- a/project/jni/lzo2/Android.mk
+++ b/project/jni/lzo2/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := lzo2
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DHAVE_CONFIG_H -DLZO_HAVE_CONFIG_H=1
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DLZO_HAVE_CONFIG_H=1
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/mad/Android.mk b/project/jni/mad/Android.mk
index b60ed81e1..e1e4cbc45 100644
--- a/project/jni/mad/Android.mk
+++ b/project/jni/mad/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := mad
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 \
 					-DFPM_64BIT -DOPT_SPEED \
 					-DSTDC_HEADERS -DHAVE_UNISTD_H \
 					-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \
diff --git a/project/jni/mikmod/Android.mk b/project/jni/mikmod/Android.mk
index a841e9b4b..19f190142 100644
--- a/project/jni/mikmod/Android.mk
+++ b/project/jni/mikmod/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := mikmod
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH) -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include $(LOCAL_PATH)
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/ogg/Android.mk b/project/jni/ogg/Android.mk
index c330ee77f..1a531aa73 100644
--- a/project/jni/ogg/Android.mk
+++ b/project/jni/ogg/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := ogg
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/openal/Android.mk b/project/jni/openal/Android.mk
index d28dd1692..9802a2741 100644
--- a/project/jni/openal/Android.mk
+++ b/project/jni/openal/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := openal
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DHAVE_CONFIG_H -DAL_ALEXT_PROTOTYPES
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H -DAL_ALEXT_PROTOTYPES
 
 
 
diff --git a/project/jni/sdl-1.3/Android.mk b/project/jni/sdl-1.3/Android.mk
index d3f3b5453..a4fe4d229 100644
--- a/project/jni/sdl-1.3/Android.mk
+++ b/project/jni/sdl-1.3/Android.mk
@@ -8,7 +8,8 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 \
 	-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
 	-DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\" \
 	-DSDL_TRACKBALL_KEYUP_DELAY=$(SDL_TRACKBALL_KEYUP_DELAY) \
diff --git a/project/jni/sdl_blitpool/Android.mk b/project/jni/sdl_blitpool/Android.mk
index 54d957653..71dbcedfe 100644
--- a/project/jni/sdl_blitpool/Android.mk
+++ b/project/jni/sdl_blitpool/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_blitpool
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_gfx/Android.mk b/project/jni/sdl_gfx/Android.mk
index da20afa50..23fee7743 100644
--- a/project/jni/sdl_gfx/Android.mk
+++ b/project/jni/sdl_gfx/Android.mk
@@ -4,8 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_gfx
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
-                -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include -Os
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_image/Android.mk b/project/jni/sdl_image/Android.mk
index adf2a10f5..1fa3c2600 100644
--- a/project/jni/sdl_image/Android.mk
+++ b/project/jni/sdl_image/Android.mk
@@ -4,8 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_image
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg/include -I$(LOCAL_PATH)/../png/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
-				-DLOAD_PNG -DLOAD_JPG -DLOAD_GIF -DLOAD_BMP
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../jpeg/include $(LOCAL_PATH)/../png/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -DLOAD_PNG -DLOAD_JPG -DLOAD_GIF -DLOAD_BMP
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_main/Android.mk b/project/jni/sdl_main/Android.mk
index 831418522..82c50b850 100644
--- a/project/jni/sdl_main/Android.mk
+++ b/project/jni/sdl_main/Android.mk
@@ -8,9 +8,8 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
-	-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
-	-DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\"
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_CFLAGS := -DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) -DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\"
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
index ffcab6b9f..3b8a3ccef 100644
--- a/project/jni/sdl_mixer/Android.mk
+++ b/project/jni/sdl_mixer/Android.mk
@@ -4,11 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_mixer
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
-				-I$(LOCAL_PATH)/../mad/include -I$(LOCAL_PATH)/../flac/include -I$(LOCAL_PATH)/../ogg/include \
-				-I$(LOCAL_PATH)/../vorbis/include -I$(LOCAL_PATH)/../tremor/include -I$(LOCAL_PATH)/../mikmod/include \
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include \
+					$(LOCAL_PATH)/../mad/include $(LOCAL_PATH)/../flac/include $(LOCAL_PATH)/../ogg/include \
+					$(LOCAL_PATH)/../vorbis/include $(LOCAL_PATH)/../tremor/include $(LOCAL_PATH)/../mikmod/include \
+					$(LOCAL_PATH)/timidity 
+LOCAL_CFLAGS := -O3 \
 				-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC \
-				-I$(LOCAL_PATH)/timidity -DMID_MUSIC -DUSE_TIMIDITY_MIDI
+				-DMID_MUSIC -DUSE_TIMIDITY_MIDI
 
 LOCAL_CPP_EXTENSION := .cpp
 
@@ -28,8 +30,8 @@ endif
 LOCAL_STATIC_LIBRARIES += ogg
 
 ifneq ($(SDL_MIXER_USE_LIBMAD),)
-	LOCAL_CFLAGS += -DMP3_MAD_MUSIC
-	LOCAL_SHARED_LIBRARIES += mad
+LOCAL_CFLAGS += -DMP3_MAD_MUSIC
+LOCAL_SHARED_LIBRARIES += mad
 endif
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/project/jni/sdl_net/Android.mk b/project/jni/sdl_net/Android.mk
index 5fa1d95c5..1e57637db 100644
--- a/project/jni/sdl_net/Android.mk
+++ b/project/jni/sdl_net/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_net
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_ttf/Android.mk b/project/jni/sdl_ttf/Android.mk
index 27fc54d5b..3a2cf2739 100644
--- a/project/jni/sdl_ttf/Android.mk
+++ b/project/jni/sdl_ttf/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_ttf
 
-LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include -I$(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(LOCAL_PATH)/../freetype/include $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -Os
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/stlport/Android.mk b/project/jni/stlport/Android.mk
index 76ab6f7a6..7920fd022 100644
--- a/project/jni/stlport/Android.mk
+++ b/project/jni/stlport/Android.mk
@@ -8,7 +8,8 @@ ifneq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := dummy.c
 else
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src -DANDROID_NO_COUT=1 -frtti -fexceptions
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/stlport $(LOCAL_PATH)/src 
+LOCAL_CFLAGS := -O3 -DANDROID_NO_COUT=1 -frtti -fexceptions
 
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(addprefix src/,$(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp $(LOCAL_PATH)/src/*.c)))
diff --git a/project/jni/theora/Android.mk b/project/jni/theora/Android.mk
index 6fa014a24..fcdf55c16 100644
--- a/project/jni/theora/Android.mk
+++ b/project/jni/theora/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := theora
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/lib -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/../vorbis/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/lib $(LOCAL_PATH) $(LOCAL_PATH)/../ogg/include $(LOCAL_PATH)/../vorbis/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/timidity/Android.mk b/project/jni/timidity/Android.mk
index f759f9726..6d5835724 100644
--- a/project/jni/timidity/Android.mk
+++ b/project/jni/timidity/Android.mk
@@ -6,8 +6,8 @@ LOCAL_MODULE := timidity
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -DHAVE_CONFIG_H
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) $(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/tremor/Android.mk b/project/jni/tremor/Android.mk
index 965be5131..a061a6c90 100644
--- a/project/jni/tremor/Android.mk
+++ b/project/jni/tremor/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := tremor
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -DHAVE_ALLOCA_H -I$(LOCAL_PATH)/../ogg/include/ogg -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/include/tremor
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../ogg/include/ogg $(LOCAL_PATH)/../ogg/include $(LOCAL_PATH)/include/tremor
+LOCAL_CFLAGS := -O3 -DHAVE_ALLOCA_H
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/vorbis/Android.mk b/project/jni/vorbis/Android.mk
index 8fd9bdf4c..0900dfc73 100644
--- a/project/jni/vorbis/Android.mk
+++ b/project/jni/vorbis/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := vorbis
 
-LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/src $(LOCAL_PATH) $(LOCAL_PATH)/../ogg/include
+LOCAL_CFLAGS := -O3 -DHAVE_CONFIG_H
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/xerces/Android.mk b/project/jni/xerces/Android.mk
index 07a23e56b..d708ad428 100644
--- a/project/jni/xerces/Android.mk
+++ b/project/jni/xerces/Android.mk
@@ -6,11 +6,12 @@ XERCES_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/
 
 LOCAL_MODULE := xerces
 
-LOCAL_CFLAGS := -Os -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include \
-                -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/include/xercesc/util -I$(LOCAL_PATH)/include/xercesc/util/MsgLoaders/InMemory \
-                -I$(LOCAL_PATH)/include/xercesc/dom/ -I$(LOCAL_PATH)/include/xercesc/dom/impl \
-                -I$(LOCAL_PATH)/include/xercesc/validators/schema/identity -I$(LOCAL_PATH)/include/xercesc/util/Transcoders/IconvGNU/ \
-                -I$(LOCAL_PATH)/include/xercesc/sax -D__sF=__SDL_fake_stdout
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/src $(LOCAL_PATH)/include \
+                    $(LOCAL_PATH)/.. $(LOCAL_PATH)/include/xercesc/util $(LOCAL_PATH)/include/xercesc/util/MsgLoaders/InMemory \
+                    $(LOCAL_PATH)/include/xercesc/dom/ $(LOCAL_PATH)/include/xercesc/dom/impl \
+                    $(LOCAL_PATH)/include/xercesc/validators/schema/identity $(LOCAL_PATH)/include/xercesc/util/Transcoders/IconvGNU/ \
+                    $(LOCAL_PATH)/include/xercesc/sax
+LOCAL_CFLAGS := -Os -DHAVE_CONFIG_H -D__sF=__SDL_fake_stdout
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/xml2/Android.mk b/project/jni/xml2/Android.mk
index 3aa2736f1..49e2d302a 100644
--- a/project/jni/xml2/Android.mk
+++ b/project/jni/xml2/Android.mk
@@ -4,7 +4,8 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := xml2
 
-LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include -D__sF=__SDL_fake_stdout
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include 
+LOCAL_CFLAGS := -Os -D__sF=__SDL_fake_stdout
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/zzip/Android.mk b/project/jni/zzip/Android.mk
index 332d00492..06b9bce7a 100644
--- a/project/jni/zzip/Android.mk
+++ b/project/jni/zzip/Android.mk
@@ -6,8 +6,9 @@ LOCAL_MODULE := zzip
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/zzip -type d))
 
-LOCAL_CFLAGS := -O3 $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
-				-I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_C_INCLUDES := $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
+					$(LOCAL_PATH)/include $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_CFLAGS := -O3
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/readme.txt b/readme.txt
index 8df1da60b..de764b881 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,21 +1,18 @@
 This is libSDL 1.2 and 1.3 ported to Google Android (also bunch of other libs included).
-Alien Blaster game is used as working example (original sources: http://www.schwardtnet.de/alienblaster/ ).
 
 Installation
 ============
 
-This should be compiled with Android 2.2 SDK and NDK r4b - google for them and install them as described in their docs
+This should be compiled with Android 2.2 SDK and NDK r4b/r5b (r5b preferred, but it fails with Cygwin) -
+google for them and install them as described in their docs
 (the application will run on Android 1.6 and above).
-You'll need to install Ant too.
+You'll need to install Java Ant too.
 The most supported environnment for that port is Linux, MacOs should be okay too, 
 If you're developing under Windows you'd better install andLinux or Ubuntu+Wubi, to get proper Linux environment
 running inside Windows, then install Linux toolchain on it. I was told andLinux compiles faster than Cygwin.
 Also you'll need full set of Linux utils and symlinks support to launch ChangeAppSettings.sh (sh, grep, sed, tr).
 http://www.pocketmagic.net/?p=1332 - guide how to set up environment in Cygwin.
 
-Please don't use NDK r5, it is buggy, wait for NDK r5b:
-http://groups.google.com/group/android-ndk/browse_thread/thread/6b35728eec7ef52f/b57f52776842041d
-
 How to compile demo application
 ===============================
 
@@ -40,9 +37,6 @@ remove project/jni/application/src symlink and make new one pointing to glxgears
 Note that GL ES is NOT pure OpenGL - there are no glBegin() and glEnd() call and other widely used functions,
 and generally it will take a lot of effort to port pure OpenGL application to GL ES.
 
-Previously The Alien Blaster was the default demo application, however it uses SDL 1.3 and I'm breaking
-the compilation too often, so if something does not compile please try to use some older revision.
-
 How to compile your own application
 ===================================
 
@@ -78,19 +72,19 @@ The C++ files shall have .cpp extension to be compiled, rename them if necessary
 Also you can replace icon image at project/res/drawable/icon.png and image project/res/drawable/publisherlogo.png.
 Then you can launch build.sh.
 
-The NDK has RTTI and exceptions disabled for C++ code, if you need them you may download modified NDK from
+The NDK r4b has RTTI and exceptions disabled for C++ code, if you need them you may download modified NDK from
 http://www.crystax.net/android/ndk-r4.php - note however that you cannot throw exceptions across shared library boundary.
+The NDK r5b already has support for RTTI and exceptions.
 Unzip it, and put in your PATH instead of original NDK - do not rename the target dir, my makefiles will
 check if there's "crystax" string in path to gcc toolchain, and will disable STLPort because CrystaX NDK
 already contains STL library.
-The NDK r5 now contains full support for RTTI/exceptions, however I did not integrate it yet.
-Also STL imlpementations from NDK r5 and from CrystaX NDK will crash on x5a/x6d tablet, and possibly on Smartq V7,
+STL imlpementations from NDK r5b and from CrystaX NDK will crash on x5a/x6d tablet, and possibly on Smartq V7,
 when you try to output anything to std::cout or std::cerr, the STLPort included in this port will not crash.
 
 Application data may be bundled with app itself, or downloaded from net on first run.
-Create .ZIP file with your application data, and put it on HTTP server, or to "project/jni/application/src/AndroidData" dir - 
+Create .ZIP file with your application data, and put it on HTTP server, or to "project/jni/application/src/AndroidData" dir -
 ChangeAppSettings.sh will ask you for the URL, if URL won't contain "http://" it will try to unzip file from AndroidData dir.
-Note that there is limit on maximum .APK file size on Market, like 20 Mb or so, so big files should be downloaded by HTTP.
+Note that there is limit on maximum .APK file size on Market, like 50 Mb or so, so big files should be downloaded by HTTP.
 If you'll release new version of data files you should change download URL or data file name and update your app as well -
 the app will re-download the data if URL does not match the saved URL from previous download.
 
@@ -101,7 +95,7 @@ SDL_ListModes()[0] will always return native screen resolution.
 Also make sure that your HW textures are not wider than 1024 pixels, or it will fail to allocate such
 texture on HTC G1. Software surfaces may be of any size of course (but you don't want to do expensive memcpy).
 
-If you want HW acceleration there are some things to remember:
+If you want HW acceleration there are some limitations:
 You cannot blit SW surface to screen, it should be only HW surface.
 You can use colorkey, per-surface alpha and per-pixel alpha with HW surfaces.
 If you're using SDL 1.3 always use SDL_Texture, if you'll be using SDL_Surface with SDL 1.3 it will switch to SW mode.
@@ -259,7 +253,7 @@ Note that I did not test that code yet, so test reports are appreciated.
 Quick guide to debug native code
 ================================
 
-The debugging of multi-threaded apps is not supported with NDK r4 or r4b, you'll need NDK r5 and Android 2.3 emulatir or device.
+The debugging of multi-threaded apps is not supported with NDK r4 or r4b, you'll need NDK r5b and Android 2.3 emulatir or device.
 To debug your application add tag 'android:debuggable="true"' to 'application' element in AndroidManifest.xml,
 recmpile and reinstall your app, go to "project" dir and launch command
 	ndk-gdb --verbose --start --force