mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 04:29:09 +00:00
Code Issues Activity

(svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added in 10.3

Browse Source 
this have the sideeffect that 10.2.8 will still have the "failure to save with certain chars in the filename bug", but at least it can compile again
This commit is contained in:
bjarni
2006-03-22 13:06:50 +00:00
parent adab6f6438
commit 0b102f0e00
6 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
os/macosx/Makefile.setup
View File

@@ -23,16 +23,6 @@ endif
UNIVERSAL_BINARY:=1
endif
ifndef UNIVERSAL_BINARY
ifndef JAGUAR
ifeq ($(shell uname), Darwin)
# it's a hardware mac, not crosscompiling
$(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
IS_G5:=$(shell os/macosx/G5_detector)
endif
endif
endif
ifdef UNIVERSAL_BINARY
ifndef STATIC
$(warning Compiling a universal binary, that is not static. Adding static flag)
@@ -78,3 +68,19 @@ ifdef TRIPLE_BINARY
LDFLAGS += -arch ppc970
endif
endif
# setting up flags to make a binary, that fits the system it builds on
ifndef UNIVERSAL_BINARY
ifndef JAGUAR
ifeq ($(shell uname), Darwin)
# it's a hardware mac, not crosscompiling
# 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
endif
endif
endif
endif