summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-03-23 13:40:33 +0000
committerbjarni <bjarni@openttd.org>2006-03-23 13:40:33 +0000
commite13a6c79c3673499f802a3800d358f124266b696 (patch)
tree4237915d777ddbbf647578bb8115b8706df36497
parent5ea7685c2d6171ec40ce422e6c45c8e81368c3c4 (diff)
downloadopenttd-e13a6c79c3673499f802a3800d358f124266b696.tar.xz
(svn r4061) -Codechange: [OSX] removed some long dead flags for universal binary building and removed an absolute path for hdiutil (I don't thin anybody will have it at a non-default place, but still)
-rw-r--r--os/macosx/Makefile13
1 files changed, 3 insertions, 10 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index cf2c50fc6..d4a177c53 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -27,13 +27,6 @@ ifdef TRIPLE_BINARY
$(Q)rm $@.uni $@.ppc970
endif
-ifdef UNIVERSAL_PPC_PART
-# the bundle is build by the PPC compile when making universal binaries
-BUILD_OSX_BUNDLE:=
-else
-BUILD_OSX_BUNDLE:=build_OSX_bundle
-endif
-
ifdef JAGUAR
JAGUAR_POSTFIX := -jaguar
endif
@@ -41,7 +34,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)
+BUILD_OSX_BUNDLE: $(TTD)
@echo '===> Building application bundle'
$(Q)rm -fr "$(OSXAPP)"
$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
@@ -73,9 +66,9 @@ release: all
$(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
$(Q)cp scenario/* "OpenTTD $(REV)/scenario/"
- $(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
+ $(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
$(Q)rm -fr "OpenTTD $(REV)"
-$(OSX): $(TTD) $(BUILD_OSX_BUNDLE)
+$(OSX): $(TTD) BUILD_OSX_BUNDLE
.PHONY: release $(BUILD_OSX_BUNDLE) $(UNIVERSAL_BINARY)