diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-09 13:17:31 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-09 13:17:31 +0000 |
| commit | 3923eab4241b642841d5f94bbf99f604631e0a54 (patch) | |
| tree | 9d7e8a513a14468359dca6c32e2de0bf9e5bf0b6 /os/macosx/Makefile.setup | |
| parent | 073aae307e4792f0afbf1c01a7f1b1640c08a1f0 (diff) | |
| download | openttd-3923eab4241b642841d5f94bbf99f604631e0a54.tar.xz | |
(svn r3276) reverted the last two commits. OSX 10.2 kept finding new stuff to prevent it from running OpenTTD, so now it's not supported anymore
Diffstat (limited to 'os/macosx/Makefile.setup')
| -rw-r--r-- | os/macosx/Makefile.setup | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 9b8441856..f42f34bf4 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -29,29 +29,16 @@ $(warning Compiling a release build, that is a debug build) endif endif -ifdef JAGUAR -ifdef FAT_BINARY -$(error FAT_BINARY and JAGUAR can't be used at the same time) -endif -endif - # setup flags if none are defined -ifndef CFLAGS_JAGUAR - CFLAGS_JAGUAR:= -isysroot /Developer/SDKs/MacOSX10.2.8.sdk -endif -ifndef LDFLAGS_JAGUAR - LDFLAGS_JAGUAR:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk -endif - -ifndef PPC_CC - PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0 -endif ifndef CFLAGS_PPC CFLAGS_PPC:= -isysroot /Developer/SDKs/MacOSX10.3.9.sdk endif ifndef LDFLAGS_PPC LDFLAGS_PPC:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.3.9.sdk endif +ifndef PPC_CC + PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0 +endif ifndef CFLAGS_x86 CFLAGS_x86:= -isysroot /Developer/SDKs/MacOSX10.4u.sdk endif @@ -128,14 +115,3 @@ $(error no x86 SDL lib found) LDFLAGS:= $(LDFLAGS_PPC) endif endif - -ifdef JAGUAR - CFLAGS:=$(CFLAGS_JAGUAR) - LDFLAGS:=$(LDFLAGS_JAGUAR) - # network support is broken is jaguar (OSX 10.2) - WITH_NETWORK:= - # crosscompiling for jaguar should always be static - STATIC:=1 - # libpng appears to break it too - WITH_PNG:= -endif
\ No newline at end of file |