diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-02-11 14:57:20 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2011-02-11 14:57:20 +0000 |
| commit | ec8d962c2bbaa9c2da518c665b75f00cc02b2d3d (patch) | |
| tree | 729fd509bc84db84176001a00573c68b84d5e85a | |
| parent | 8c32fb86ad7f40f9cfc77a81458f4d5357876335 (diff) | |
NDK_TOOLCHAIN is used by Android NDK for something else, so rename to NDK_TOOLCHAIN_BASE
svn path=/trunk/externals/template/; revision=14912
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -121,13 +121,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 |