diff options
| author | truelight <truelight@openttd.org> | 2006-05-27 20:51:57 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-05-27 20:51:57 +0000 |
| commit | 74e8c30aa68a2cfc17e5cb55b95253d568db5094 (patch) | |
| tree | ae2a9cb38c1bde84d26c9eabdedfd91000aa7822 | |
| parent | d446915a45f29676c92e525a2be36ab48e76a71a (diff) | |
| download | openttd-74e8c30aa68a2cfc17e5cb55b95253d568db5094.tar.xz | |
(svn r4994) -Fix: changed the stripping parts a bit. OSX is no longer an exeption
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | os/macosx/Makefile | 11 |
2 files changed, 2 insertions, 16 deletions
@@ -348,18 +348,11 @@ ifndef PROFILE # 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 --git a/os/macosx/Makefile b/os/macosx/Makefile index cc425ed4a..3a7ed4148 100644 --- a/os/macosx/Makefile +++ b/os/macosx/Makefile @@ -42,9 +42,6 @@ endif 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 @@ $(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970) endif -# manual strip, as the -s option fails -$(OSX_STRIP): $(TTD) - $(Q)$(STRIP) openttd - ifdef JAGUAR JAGUAR_POSTFIX := -jaguar endif @@ -113,7 +106,7 @@ endif # 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 @@ release: all $(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) |