diff options
Diffstat (limited to 'xc/config/cf/darwin.cf')
| -rw-r--r-- | xc/config/cf/darwin.cf | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/xc/config/cf/darwin.cf b/xc/config/cf/darwin.cf index 2ba4f78e0..70f3cca2f 100644 --- a/xc/config/cf/darwin.cf +++ b/xc/config/cf/darwin.cf @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.6 2001/02/02 21:40:40 herrb Exp $ -/* Darwin / MacOS-X configuration by John Carmack <johnc@idsoftware.com> */ +/* Darwin / Mac OS X configuration by John Carmack <johnc@idsoftware.com> */ /* imake determines the default values by parsing uname */ #define OSName DefaultOSName @@ -21,25 +21,27 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ */ #define XFree86Devel NO +/* + * This enables Quartz compatibility. + * Turn off to build on raw Darwin systems. + */ +#define DarwinQuartzSupport YES + /* we don't need -lm */ #define MathLibrary /**/ /* we don't have a termcap library */ -#define TermcapLibrary /**/ +#define TermcapLibrary /**/ /* we don't have a dbm library */ -#define DBMLibrary /**/ +#define DBMLibrary /**/ /* our cpp isn't in /lib/cpp */ #define CppCmd /usr/bin/cpp /* we have a gcc compatible compiler, but its not called gcc */ #define CcCmd /usr/bin/cc - -/* if -c isn't passed, there are problems with the cfb libs when - * they include an object file without any symbols - */ -#define RanlibCmd ranlib -c +#define CplusplusCmd /usr/bin/c++ /* uncommenting this line will get -g instead of -O, which builds * a lot faster and gets debug info @@ -49,6 +51,7 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #endif /* default flags to pass to cc */ +#ifndef DefaultCCOptions #if XFree86Devel # define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ @@ -57,17 +60,17 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #else # define DefaultCCOptions -Wall -Wpointer-arith -traditional-cpp #endif +#endif -/* a lot of xfree86 code needs __powerpc__ to avoid doing outport asm +/* A lot of xfree86 code needs __powerpc__ to avoid doing outport asm. * * __DARWIN__ will be used for platform specific #ifdefs that can't - * be handled by existing X defines + * be handled by existing X defines. * - * there is an unfortunate symbol collision with the appkit for TIFFFaxBlackCodes - * - * We need to define BSD44SOCKETS to get unix domain socket namelen calculated right + * Darwin's alloca() seg faults (rather than returning NULL) on failed + * allocations, so we can't use it. */ -#define StandardDefines -D__powerpc__ -D__DARWIN__ +#define StandardDefines -D__powerpc__ -D__DARWIN__ -DNO_ALLOCA /* programs/rgb/rgb.h and others needs this */ #define HasNdbm YES @@ -100,6 +103,16 @@ XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ #define BuildXvExt NO + +/* no OpenGL libraries */ +#ifndef BuildGLXLibrary +# define BuildGLXLibrary NO +#endif +#ifndef BuildGLULibrary +# define BuildGLULibrary NO +#endif + + /* include all the xfree rules */ /* I haven't tracked down why this is needed, but it is... */ #include <xfree86.cf> |