diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-13 18:38:25 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-13 18:38:25 -0500 |
| commit | c8feb73f5841e7812d8dfdb91f1064e2033d028c (patch) | |
| tree | 4f176f28ec27a4e5bfb9c671e569838741b6bfbd /GL | |
| parent | 9a7ce573636e349ee2967991c7cc1407e80ae524 (diff) | |
| parent | a125ce4a84f5fb5934fefebd7cfb22a83180874d (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
Diffstat (limited to 'GL')
| -rw-r--r-- | GL/Makefile.am | 8 | ||||
| -rw-r--r-- | GL/apple/Makefile.am | 19 | ||||
| -rw-r--r-- | GL/glx/glxscreens.c | 2 |
3 files changed, 20 insertions, 9 deletions
diff --git a/GL/Makefile.am b/GL/Makefile.am index 38cef7b39..29d03f2d6 100644 --- a/GL/Makefile.am +++ b/GL/Makefile.am @@ -1,7 +1,9 @@ -if XDARWIN -DARWIN_SUBDIRS = apple +if XQUARTZ +XQUARTZ_SUBDIRS = apple endif -SUBDIRS = glx mesa $(DARWIN_SUBDIRS) + +SUBDIRS = glx mesa $(XQUARTZ_SUBDIRS) +DIST_SUBDIRS = glx mesa apple WINDOWS_EXTRAS = \ windows/ChangeLog \ diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am index 2b2d10cbc..33ad15714 100644 --- a/GL/apple/Makefile.am +++ b/GL/apple/Makefile.am @@ -1,8 +1,12 @@ -AM_CFLAGS = -I$(top_srcdir) \ - -I$(top_srcdir)/hw/darwin/quartz \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/hw/darwin/quartz/cr \ - -I$(top_srcdir)/GL/include +AM_CFLAGS = $(DIX_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/GL/glx \ + -I$(top_srcdir)/GL/include \ + -I$(top_srcdir)/GL/mesa/glapi \ + -I$(top_srcdir)/hw/xquartz \ + -I$(top_srcdir)/hw/xquartz/xpr \ + -I$(top_srcdir)/miext/damage if HAVE_AGL_FRAMEWORK noinst_LIBRARIES = libAGLcore.a @@ -13,3 +17,8 @@ libAGLcore_a_SOURCES = aglGlx.c \ $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \ $(top_srcdir)/hw/dmx/glxProxy/compsize.c endif + +#noinst_LIBRARIES = libCGLcore.a +#libCGLcore_a_SOURCES = \ +# indirect.c \ +# $(top_srcdir)/hw/dmx/glxProxy/compsize.c diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index bf090662a..88773a785 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -175,7 +175,7 @@ static char GLXServerExtensions[] = "GLX_EXT_texture_from_pixmap " "GLX_OML_swap_method " "GLX_SGI_make_current_read " -#ifndef __DARWIN__ +#ifndef __APPLE__ "GLX_SGIS_multisample " "GLX_SGIX_hyperpipe " "GLX_SGIX_swap_barrier " |