# HG changeset patch # User Sam Lantinga # Date 1293939503 28800 # Node ID bd009a92344170d781935d9e43a806a6b1797aa2 # Parent 77f079051f60097012680c87b9fd6b249e363a1e Updated for NDK R5 diff -r 77f079051f60 -r bd009a923441 Makefile.android --- 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 diff -r 77f079051f60 -r bd009a923441 android/config.cfg --- 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