diff options
| author | bjarni <bjarni@openttd.org> | 2006-03-22 13:06:50 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-03-22 13:06:50 +0000 |
| commit | 0b102f0e007a93209206c0fd898d725c402e16b2 (patch) | |
| tree | eda101e579e395fa1de8cb0fac3a661484c4946f /os | |
| parent | adab6f643878284b20eba0dff535923f6c1d8d8b (diff) | |
| download | openttd-0b102f0e007a93209206c0fd898d725c402e16b2.tar.xz | |
(svn r4019) -Fix: [OSX] stopped using iconv for 10.2.8, since it was added in 10.3
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
Diffstat (limited to 'os')
| -rw-r--r-- | os/macosx/Makefile.setup | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 4871e156e..159bf0aa5 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -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 |