petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r7588) -Change: [OSX] removed the flag JAGUAR since it didn't work anyway

Browse Source 
Also removed all the Makefile code regarding this flag since it's no longer needed
   Removed documentation about special limitations regarding running the game on OSX 10.2
   OpenTTD now officially needs OSX 10.3.9 to work correctly (the trunk needed that for months)
This commit is contained in:
bjarni
2006-12-28 01:24:00 +00:00
parent 1f836aa995
commit d657aa97de
4 changed files with 9 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os/macosx/Makefile
View File

@@ -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

21
os/macosx/Makefile.setup
View File

@@ -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