Mercurial > sdl-ios-xcode

changeset 4941:bd009a923441

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated for NDK R5
author Sam Lantinga <slouken@libsdl.org>
date Sat, 01 Jan 2011 19:38:23 -0800
parents 77f079051f60
children c127755eebee
files Makefile.android android/config.cfg
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.android	Sat Jan 01 16:56:54 2011 -0800
+++ b/Makefile.android	Sat Jan 01 19:38:23 2011 -0800
@@ -2,9 +2,8 @@
 
 include ./android/config.cfg #get ANDROID_NDK
 
-TOOLS_PATH=$(ANDROID_NDK)/build/prebuilt/linux-x86/arm-eabi-4.2.1/bin
-ANDROID_INCLUDES = 	-I$(ANDROID_NDK)/build/platforms/android-4/common/include \
-					-I$(ANDROID_NDK)/build/platforms/android-4/arch-arm/usr/include 
+TOOLS_PATH=$(ANDROID_NDK)/toolchains/arm-eabi-4.4.0/prebuilt/darwin-x86/bin
+ANDROID_INCLUDES = -I$(ANDROID_NDK)/platforms/android-4/arch-arm/usr/include 
 INCLUDE = -I./include
 CFLAGS  = -g -O2 $(INCLUDE) $(ANDROID_INCLUDES) -DANDROID -DANDROID_NDK -static
 
--- a/android/config.cfg	Sat Jan 01 16:56:54 2011 -0800
+++ b/android/config.cfg	Sat Jan 01 19:38:23 2011 -0800
@@ -1,1 +1,1 @@
-ANDROID_NDK=/home/paul/Projects/gsoc/sdk/android-ndk-r4
+ANDROID_NDK=/Users/hercules/tmp/android-ndk-r5