From 1c95764c54a72a5fd005dc07c6008c4188d298e1 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 4 Jun 2013 16:08:00 +0000 Subject: [PATCH] changed strip flags to not strip by default. cos that's kinda pointless tbh. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4387 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 770fd9e1..2a4b8b5c 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1,6 +1,6 @@ CC=gcc WINDRES=windres -STRIP=strip +STRIP?=echo strip STRIPFLAGS=--strip-unneeded --remove-section=.comment @@ -9,6 +9,8 @@ CPUOPTIMIZATIONS= #canonicalize the source path. except emscripten warns about that like crazy. *sigh* ifeq ($(FTE_TARGET),web) BASE_DIR:=. +else ifeq ($(FTE_TARGET),droid) + BASE_DIR:=. else BASE_DIR:=$(realpath .) endif @@ -86,9 +88,9 @@ ifeq ($(FTE_TARGET),droid) else #we're running upon windows ifeq ($(DROID_ARCH),x86) - TOOLCHAIN:=$(ANDROID_NDK_ROOT)/toolchains/x86-4.7/prebuilt/windows/bin/i686-android-linux- + TOOLCHAIN:=$(ANDROID_NDK_ROOT)/toolchains/x86-4.7/prebuilt/windows-x86_64/bin/i686-linux-android- else - TOOLCHAIN:=$(ANDROID_NDK_ROOT)/toolchains/arm-linux-androideabi-4.7/prebuilt/windows/bin/arm-linux-androideabi- + TOOLCHAIN:=$(ANDROID_NDK_ROOT)/toolchains/arm-linux-androideabi-4.7/prebuilt/windows-x86_64/bin/arm-linux-androideabi- endif ANDROID_SCRIPT=android.bat #make can't cope with absolute win32 paths in dependancy files