From 3eb7b0a346cbf8ae4180c17153e0af5e515de262 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 11 Feb 2011 14:57:20 +0000 Subject: NDK_TOOLCHAIN is used by Android NDK for something else, so rename to NDK_TOOLCHAIN_BASE svn path=/trunk/externals/maxlib/; revision=14912 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9a76c68..7997108 100644 --- a/Makefile +++ b/Makefile @@ -122,13 +122,13 @@ ifeq ($(UNAME),ANDROID) NDK_PLATFORM_VERSION := 5 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_VERSION)/arch-arm NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') - NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86 - CC := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-gcc --sysroot=$(NDK_SYSROOT) + NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86 + CC := $(NDK_TOOLCHAIN_BASE)/bin/arm-linux-androideabi-gcc --sysroot=$(NDK_SYSROOT) OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer CFLAGS += LDFLAGS += -Wl,--export-dynamic -shared LIBS += -lc - STRIP := $(NDK_TOOLCHAIN)/bin/arm-linux-androideabi-strip \ + STRIP := $(NDK_TOOLCHAIN_BASE)/bin/arm-linux-androideabi-strip \ --strip-unneeded -R .note -R .comment DISTBINDIR=$(DISTDIR)-$(OS)-$(shell uname -m) endif -- cgit v1.2.1