diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | docs/OSX_why_multiple_applications.txt | 10 | ||||
| -rw-r--r-- | os/macosx/Makefile | 6 | ||||
| -rw-r--r-- | os/macosx/Makefile.setup | 21 |
4 files changed, 9 insertions, 37 deletions
@@ -112,9 +112,6 @@ # OTTD_PPC, OTTD_PPC970, OTTD_i386: compile for target architecture. # Multiple flags can be used so OTTD_PPC:=1 OTTD_i386:=1 produces the same result as UNIVERSAL_BINARY # -# JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer -# This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config -# # ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR. # PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian. # this means that you don't have to think about endianess when compiling for OSX. @@ -538,10 +535,8 @@ endif # iconv is enabled defaultly on OSX >= 10.3 ifdef OSX - ifndef JAGUAR - WITH_ICONV=1 - LIBS += -liconv - endif + WITH_ICONV=1 + LIBS += -liconv endif ifdef WITH_ICONV diff --git a/docs/OSX_why_multiple_applications.txt b/docs/OSX_why_multiple_applications.txt deleted file mode 100644 index 74205d7c4..000000000 --- a/docs/OSX_why_multiple_applications.txt +++ /dev/null @@ -1,10 +0,0 @@ -There are currently two different downloads for OSX, one is named osx, while the other one is named osx-jaguar - -The reason for this is that Apple added more functionality to 10.3 and to make use of that, it will no longer run on OSX 10.2 (codenamed Jaguar). To make the game useable on Jaguar, then a special download is available, but it will miss the bugfixes/features, that relies on newer functionality. - -The general download is a universal binary and should work great on all macs using 10.3.9 or newer, no matter what processor it got. You should at all time avoid the Jaguar Build if possible. - -Technically the universal binary is a triple binary because it contains code for 3 CPUs and the CPUs in question are PPC (G3+G4), G5 and Intel. The Jaguar build is only optimised for PPC and other (newer) CPUs will not benefit so much from their advanced features. This is another reason to avoid the Jaguar build. It's generally slower on modern CPUs. - -Current list of missing features in the Jaguar build: --Can't save screenshots or savegames if certain chars are in the filename. This mainly applies to European chars and hits German hard as the month Mär (Mar) can't be saved 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 |