diff options
Diffstat (limited to 'os/macosx')
| -rw-r--r-- | os/macosx/Makefile | 6 | ||||
| -rw-r--r-- | os/macosx/Makefile.setup | 21 |
2 files changed, 7 insertions, 20 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile index 4526c4803..9a6b592aa 100644 --- a/os/macosx/Makefile +++ b/os/macosx/Makefile @@ -106,9 +106,6 @@ endif $(OSX_STRIP): $(TTD) $(Q)$(STRIP) openttd -ifdef JAGUAR -JAGUAR_POSTFIX := -jaguar -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 @@ -136,7 +133,6 @@ release: all $(Q)mkdir -p "OpenTTD $(REV)/scenario" $(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/" $(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt" - $(Q)cp docs/OSX_why_multiple_applications.txt "OpenTTD $(REV)/why a special Jaguar download.txt" $(Q)cp readme.txt "OpenTTD $(REV)/docs/" $(Q)cp docs/console.txt "OpenTTD $(REV)/docs/" $(Q)cp COPYING "OpenTTD $(REV)/docs/" @@ -144,7 +140,7 @@ release: all $(Q)cp os/macosx/*.webloc "OpenTTD $(REV)" $(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt" $(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/" - $(Q)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.dmg $(Q)rm -fr "OpenTTD $(REV)" $(OSX): $(TTD) $(OSX_STRIP) BUILD_OSX_BUNDLE diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 8057baf1f..38565ced3 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -38,6 +38,10 @@ endif ifeq ($(shell uname), Darwin) # it's a hardware mac, not crosscompiling + ifeq ($(shell uname -r), 6.8) + # OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later +$(error OpenTTD can not run or compile on MacOS X 10.2. 10.3.9 or newer is needed) + endif NATIVE_OSX:=1 endif @@ -85,26 +89,13 @@ ifdef OTTD_PPC970 endif endif -ifdef JAGUAR - CFLAGS += -isysroot /Developer/SDKs/MacOSX10.2.8.sdk - LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk - OTTD_PPC:=1 -endif - # setting up flags to make a binary, that fits the system it builds on ifdef NATIVE_OSX ifndef UNIVERSAL_BINARY # we are not crosscompiling for other macs - ifndef JAGUAR - # the next line fails if it got whitespace in front of it + # the next line fails if it got whitespace in front of it $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector) - IS_G5:=$(shell os/macosx/G5_detector) - ifeq ($(shell uname -r), 6.8) - # OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later - JAGUAR:=1 - OTTD_PPC:=1 - endif - endif + IS_G5:=$(shell os/macosx/G5_detector) endif endif |