From a887a529a0dc8ad96f383973e21ea5e138cbe295 Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 27 May 2006 17:51:11 +0000 Subject: (svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm --- os/macosx/Makefile.setup | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'os/macosx/Makefile.setup') 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 + -- cgit v1.2.3-54-g00ecf