diff options
author | truelight <truelight@openttd.org> | 2006-05-27 17:51:11 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2006-05-27 17:51:11 +0000 |
commit | 49526b594fc6586f86f4262a8f19f2f770785c10 (patch) | |
tree | 88daa5d4a533dd8021a7900402d89593917712e8 /os/macosx/Makefile.setup | |
parent | 5e73dce0e71791b87e5b096a890578eefcc26639 (diff) | |
download | openttd-49526b594fc6586f86f4262a8f19f2f770785c10.tar.xz |
(svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm
Diffstat (limited to 'os/macosx/Makefile.setup')
-rw-r--r-- | os/macosx/Makefile.setup | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 49da58e33..8057baf1f 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -65,13 +65,17 @@ endif # if any targets have been defined by now, we are crosscompiling and we will set up paths accordingly ifdef OTTD_PPC - CFLAGS_PPC += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk - LDFLAGS_PPC += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk + ifndef OSX_NO_SYSROOT + CFLAGS_PPC += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk + LDFLAGS_PPC += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk + endif endif ifdef OTTD_i386 - CFLAGS_i386 += -isysroot /Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk - LDFLAGS_i386 += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk + ifndef OSX_NO_SYSROOT + CFLAGS_i386 += -isysroot /Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk + LDFLAGS_i386 += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk + endif endif ifdef OTTD_PPC970 @@ -122,4 +126,15 @@ ifdef NATIVE_OSX endif endif endif -endif
\ No newline at end of file +endif + +ifdef OTTD_PPC +MACOSX_BUILD:=1 +endif +ifdef OTTD_i386 +MACOSX_BUILD:=1 +endif +ifdef OTTD_PPC970 +MACOSX_BUILD:=1 +endif + |