Mercurial > sdl-ios-xcode

changeset 4962:730b234ba9ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed down to NDK R4b
author Sam Lantinga <slouken@libsdl.org>
date Tue, 04 Jan 2011 21:05:42 -0800
parents c92950635837
children 604077962776
files Makefile.android android/project/default.properties
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.android	Tue Jan 04 20:37:07 2011 -0800
+++ b/Makefile.android	Tue Jan 04 21:05:42 2011 -0800
@@ -2,8 +2,14 @@
 
 include ./android/config.cfg #get ANDROID_NDK, ANDROID_NDK_HOST
 
-TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
-ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
+# For NDK R4
+TOOLS_PATH=$(ANDROID_NDK)/build/prebuilt/$(ANDROID_NDK_HOST)/arm-eabi-4.2.1/bin
+ANDROID_INCLUDES = -I$(ANDROID_NDK)/build/platforms/android-4/arch-arm/usr/include 
+
+# For NDK R5
+#TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/$(ANDROID_NDK_HOST)/bin
+#ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
+
 INCLUDE = -I./include
 CFLAGS  = -g -O2 -fno-short-enums $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
 
--- a/android/project/default.properties	Tue Jan 04 20:37:07 2011 -0800
+++ b/android/project/default.properties	Tue Jan 04 21:05:42 2011 -0800
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-4