summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2006-05-27 18:17:10 +0000
committertruelight <truelight@openttd.org>2006-05-27 18:17:10 +0000
commit08c5ee6edceaa4f55daeb6c5efbe7c9b4dc1697a (patch)
treecdee5c6d8da9afc70cf0aa24c8f6cb15de6140b0
parent1e0f16540738440488b2b734bd63f0f2ca4f6774 (diff)
downloadopenttd-08c5ee6edceaa4f55daeb6c5efbe7c9b4dc1697a.tar.xz
(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!!
-rw-r--r--Makefile2
-rw-r--r--os/macosx/Makefile5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 85659028f..3f2c7d28d 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 217569db4..cc425ed4a 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