diff options
| author | tsi <tsi> | 2009-02-01 20:37:05 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2009-02-01 20:37:05 +0000 |
| commit | e42b3fc0dbc5513548bd3d31fdbd967601ded6ff (patch) | |
| tree | efd7a457fe9753680cb7de9cea232e146b0fef5b /config/cf/darwinLib.tmpl | |
| parent | ec302378f71d0ac7dcb12323e40c530183c6be67 (diff) | |
6. Fix links against libGL that arises on MacOSX Jaguar due to its confusion
over whether to use the build-generated library or a system-provided one
(Marc La France).
Diffstat (limited to 'config/cf/darwinLib.tmpl')
| -rw-r--r-- | config/cf/darwinLib.tmpl | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/config/cf/darwinLib.tmpl b/config/cf/darwinLib.tmpl index 1cad22133..f40b491e5 100644 --- a/config/cf/darwinLib.tmpl +++ b/config/cf/darwinLib.tmpl @@ -1,12 +1,27 @@ -XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.20 2003/11/18 19:04:54 torrey Exp $ +XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.21tsi Exp $ /* * Darwin/Mac OS X shared library template */ +#if defined(DarwinArchitecture) && BuildAppleDRI +/* Next two must be absolute paths, no symlinks allowed in any component */ +NATIVE_GL = /System/Library/Frameworks/OpenGL.framework +NATIVE_GLLIB = $(NATIVE_GL)/Versions/A/Libraries/libGL.dylib +#if OSMajorVersion > 8 /* 9.what? */ +NATIVE_GLDEP = -dylib_file $(NATIVE_GLLIB):$(NATIVE_GLLIB) +#endif +#endif + +#ifndef FixupGLXLibReferences +#define FixupGLXLibReferences() @@\ +GLXLIB = LoaderLibPrefix -lGL $(NATIVE_GLDEP) +#endif + #ifndef FixupLibReferences #define FixupLibReferences() @@\ XMULIBONLY = -lXmu @@\ -XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) @@\ +FixupGLXLibReferences() #endif #ifndef XawClientLibs @@ -17,15 +32,15 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #if !defined(SharedX11Reqs) #define SharedX11Reqs #endif -#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) #define SharedXfontReqs $(LDPRELIB) $(FONTSTUBLIB) GzipLibrary $(FREETYPE2LIB) -flat_namespace #define SharedAppleWMReqs $(LDPRELIB) $(XLIB) #define SharedFontencReqs $(LDPRELIB) GzipLibrary #define SharedGLReqs $(LDPRELIB) $(XLIB) -#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -#define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB) $(XLIB) +#define SharedOSMesaReqs $(LDPRELIB) $(GLXLIB) $(XLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) |