1.1 --- a/Makefile.android Tue Jan 04 20:37:07 2011 -0800
1.2 +++ b/Makefile.android Tue Jan 04 21:05:42 2011 -0800
1.3 @@ -2,8 +2,14 @@
1.4
1.5 include ./android/config.cfg #get ANDROID_NDK, ANDROID_NDK_HOST
1.6
1.7 -TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
1.8 -ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include
1.9 +# For NDK R4
1.10 +TOOLS_PATH=$(ANDROID_NDK)/build/prebuilt/$(ANDROID_NDK_HOST)/arm-eabi-4.2.1/bin
1.11 +ANDROID_INCLUDES = -I$(ANDROID_NDK)/build/platforms/android-4/arch-arm/usr/include
1.12 +
1.13 +# For NDK R5
1.14 +#TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
1.15 +#ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include
1.16 +
1.17 INCLUDE = -I./include
1.18 CFLAGS = -g -O2 -fno-short-enums $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
1.19
2.1 --- a/android/project/default.properties Tue Jan 04 20:37:07 2011 -0800
2.2 +++ b/android/project/default.properties Tue Jan 04 21:05:42 2011 -0800
2.3 @@ -8,4 +8,4 @@
2.4 # project structure.
2.5
2.6 # Project target.
2.7 -target=android-7
2.8 +target=android-4