diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-02-11 14:57:20 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@iem.at> | 2015-10-14 13:53:22 +0200 |
| commit | 3eb7b0a346cbf8ae4180c17153e0af5e515de262 (patch) | |
| tree | 895af18c505f2b86c36c11c7c9170c2c11b00702 | |
| parent | a6c1a0bbb5c6aeea55a73fcd977c8c7c9e80e02c (diff) | |
NDK_TOOLCHAIN is used by Android NDK for something else, so rename to NDK_TOOLCHAIN_BASE
svn path=/trunk/externals/maxlib/; revision=14912
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |