# HG changeset patch
# User truelight
# Date 1148763117 0
# Node ID 2bb6493a9189b019718bbc3856345fdf4021e6d5
# Parent  b799603843f8b812f86ce4cd2d5b471ebd85e8b0
(svn r4994) -Fix: changed the stripping parts a bit. OSX is no longer an exeption

diff -r b799603843f8 -r 2bb6493a9189 Makefile
--- a/Makefile	Sat May 27 20:22:20 2006 +0000
+++ b/Makefile	Sat May 27 20:51:57 2006 +0000
@@ -348,18 +348,11 @@
 # Release mode
 ifndef MORPHOS
 ifndef IRIX
-ifdef OSX
-# it appears that OSX can't handle automated stripping when mixing C and C++
-# we will do it manually in the target OSX_STRIP
-OSX_STRIP:=OSX_STRIP
-else
 # automatical strip breaks under morphos
-CC_CFLAGS += -s
 LDFLAGS += -s
 endif
 endif
 endif
-endif
 
 ifdef OSX
 # these compilerflags makes the app run as fast as possible without making the app unstable. It works on G3 or newer
diff -r b799603843f8 -r 2bb6493a9189 os/macosx/Makefile
--- a/os/macosx/Makefile	Sat May 27 20:22:20 2006 +0000
+++ b/os/macosx/Makefile	Sat May 27 20:51:57 2006 +0000
@@ -42,9 +42,6 @@
 ifndef LIPO
 LIPO := lipo
 endif
-ifndef STRIP
-STRIP := strip
-endif
 
 # targets to link OpenTTD
 $(TTD): $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970)
@@ -102,10 +99,6 @@
 
 endif
 
-# manual strip, as the -s option fails
-$(OSX_STRIP): $(TTD)
-	$(Q)$(STRIP) openttd
-
 ifdef JAGUAR
 JAGUAR_POSTFIX := -jaguar
 endif
@@ -113,7 +106,7 @@
 # build the bundle. OSX wants to keep apps in bundles, so we will give it one
 # the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
 
-BUILD_OSX_BUNDLE: $(TTD) $(OSX_STRIP)
+BUILD_OSX_BUNDLE: $(TTD)
 	@echo '===> Building application bundle'
 	$(Q)rm -fr "$(OSXAPP)"
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
@@ -148,6 +141,6 @@
 	$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
 	$(Q)rm -fr "OpenTTD $(REV)"
 
-$(OSX): $(TTD) $(OSX_STRIP) BUILD_OSX_BUNDLE
+$(OSX): $(TTD) BUILD_OSX_BUNDLE
 
 .PHONY: release $(BUILD_OSX_BUNDLE) $(UNIVERSAL_BINARY)