From 08c5ee6edceaa4f55daeb6c5efbe7c9b4dc1697a Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 27 May 2006 18:17:10 +0000 Subject: [PATCH] (svn r4991) -Fix: don't compile UNITTEST by default, it isn't needed -Fix: do not use hardcoded names for things like 'strip', keep it configurable!! --- Makefile | 2 +- os/macosx/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85659028fd..3f2c7d28db 100644 --- a/Makefile +++ b/Makefile @@ -834,7 +834,7 @@ OSX:=OSX endif -all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX) $(UNITTEST) +all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX) ifdef OSX -include os/macosx/Makefile diff --git a/os/macosx/Makefile b/os/macosx/Makefile index 217569db4b..cc425ed4a8 100644 --- a/os/macosx/Makefile +++ b/os/macosx/Makefile @@ -42,6 +42,9 @@ endif ifndef LIPO LIPO := lipo endif +ifndef STRIP +STRIP := strip +endif # targets to link OpenTTD $(TTD): $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970) @@ -101,7 +104,7 @@ endif # manual strip, as the -s option fails $(OSX_STRIP): $(TTD) - $(Q)strip openttd + $(Q)$(STRIP) openttd ifdef JAGUAR JAGUAR_POSTFIX := -jaguar