diff options
| -rw-r--r-- | config/cf/darwinLib.tmpl | 25 | ||||
| -rw-r--r-- | lib/GL/GL/Imakefile | 7 | ||||
| -rw-r--r-- | programs/Xserver/Imakefile | 10 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 5 |
4 files changed, 32 insertions, 15 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) diff --git a/lib/GL/GL/Imakefile b/lib/GL/GL/Imakefile index f2bba757c..f59b3640a 100644 --- a/lib/GL/GL/Imakefile +++ b/lib/GL/GL/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.31tsi Exp $ +XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.32tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -249,10 +249,9 @@ XCOMM No built-in drivers. This is the usual case. DRIDOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/debugger/%.o) DRIPOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/profiled/%.o) -NATIVE_GL = /System/Library/Frameworks/OpenGL.framework +/* NATIVE_GLLIB is set in darwinLib.tmpl */ -OTHERREQUIREDLIBS = \ - XpluginLibrary $(NATIVE_GL)/Libraries/libGL.dylib -sub_library libGL \ +OTHERREQUIREDLIBS = XpluginLibrary $(NATIVE_GLLIB) -sub_library libGL \ -framework ApplicationServices -framework CoreFoundation \ -framework OpenGL #endif diff --git a/programs/Xserver/Imakefile b/programs/Xserver/Imakefile index e135097fd..e79a3675f 100644 --- a/programs/Xserver/Imakefile +++ b/programs/Xserver/Imakefile @@ -1,7 +1,7 @@ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.331tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.332tsi Exp $ /* * Copyright (c) 1994-2007 by The XFree86 Project, Inc. @@ -1569,7 +1569,7 @@ install:: $(MV) $(DESTDIR)$(BINDIR)/XDarwinApp \ $(DESTDIR)$(XDARWINAPPDIR)/MacOS/XDarwin -(cd $(DESTDIR)$(BINDIR); $(RM) XDarwinQuartz; \ - $(LN) $(DESTDIR)$(XDARWINAPPDIR)/MacOS/XDarwin XDarwinQuartz) + $(LN) $(XDARWINAPPDIR)/MacOS/XDarwin XDarwinQuartz) /* * Display mode bundles for Quartz @@ -1584,7 +1584,7 @@ BundleProgramTarget(xpr, \ $(XPRDIRS), \ $(QUARTZDIR)/xpr/xprScreen.o, \ $(XPRLIBS), \ - -framework ApplicationServices $(XPLUGINLIB)) + $(XPLUGINLIB) -framework ApplicationServices) #endif CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha @@ -1619,7 +1619,7 @@ BundleProgramTarget(glxAGL, \ GL, \ GL/glx/glxext.o, \ GL/glx/libglx.a GL/apple/libAGLcore.a, \ - -framework AGL -framework OpenGL) + -framework AGL -framework OpenGL $(NATIVE_GLDEP)) #if BuildAppleDRI BundleProgramTarget(glxCGL, \ @@ -1627,7 +1627,7 @@ BundleProgramTarget(glxCGL, \ GL, \ GL/glx/glxext.o, \ GL/glx/libglx.a GL/apple/libCGLcore.a, \ - -framework OpenGL $(XPLUGINLIB)) + $(XPLUGINLIB) -framework OpenGL $(NATIVE_GLDEP)) #endif BundleProgramTarget(glxMesa, \ diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 1d6938a96..1a4563e62 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,7 @@ XFree86 4.8.99.1 (?? February 2009) + 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). 5. Various header-related build fixes for MacOSX 10.5 (Jaguar). It is at time unknown whether or not these negatively impact the build on older versions of Darwin (Marc La France). @@ -20849,4 +20852,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3989 2008/12/27 04:17:11 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3990 2009/02/01 20:23:31 tsi Exp $ |