diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-14 14:57:09 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-11-14 15:10:32 -0800 |
| commit | b0789365719f48c0b477b4703f2072f932246b76 (patch) | |
| tree | d57274bf8a991712cf7b224a31c7f210cf642d7c | |
| parent | 1d7049f8fd3c0798250b9213149d3ce0b37ab77f (diff) | |
XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xquartz/GL/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xquartz/Makefile.am | 9 | ||||
| -rw-r--r-- | hw/xquartz/mach-startup/Makefile.am | 12 |
4 files changed, 19 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 90cacd761..74a1bee2a 100644 --- a/configure.ac +++ b/configure.ac @@ -638,7 +638,6 @@ case $host_os in XQUARTZ=yes XVFB=no XNEST=no - GLX=no COMPOSITE=no DGA=no diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am index 8f4478fec..728746af0 100644 --- a/hw/xquartz/GL/Makefile.am +++ b/hw/xquartz/GL/Makefile.am @@ -12,8 +12,10 @@ AM_CPPFLAGS = \ libCGLCore_la_SOURCES = \ indirect.c \ capabilities.c \ + glcontextmodes.c \ visualConfigs.c EXTRA_DIST = \ capabilities.h \ + glcontextmodes.h \ visualConfigs.h diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am index 782321e08..cc1ff833b 100644 --- a/hw/xquartz/Makefile.am +++ b/hw/xquartz/Makefile.am @@ -9,8 +9,13 @@ AM_CPPFLAGS = \ -DXFree86Server \ -I$(top_srcdir)/miext/rootless -# GL -SUBDIRS = bundle . xpr mach-startup doc pbproxy +if GLX +GL_DIR = GL +endif + +SUBDIRS = bundle . GL xpr mach-startup doc pbproxy + +DIST_SUBDIRS = bundle . $(GL_DIR) xpr mach-startup doc pbproxy libXquartz_la_SOURCES = \ $(top_srcdir)/fb/fbcmap_mi.c \ diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am index 800fb0c21..aa71f8e6f 100644 --- a/hw/xquartz/mach-startup/Makefile.am +++ b/hw/xquartz/mach-startup/Makefile.am @@ -27,12 +27,20 @@ X11_LDFLAGS = \ -XCClinker -Objc \ -Wl,-u,_miDCInitialize \ -Wl,-framework,Carbon \ - -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \ - -Wl,-framework,OpenGL \ -Wl,-framework,Cocoa \ -Wl,-framework,CoreAudio \ -Wl,-framework,IOKit +if GLX +X11_LDADD += \ + $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ + $(top_builddir)/glx/libglx.la + +X11_LDFLAGS += \ + -L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \ + -Wl,-framework,OpenGL +endif + bin_PROGRAMS = Xquartz dist_Xquartz_SOURCES = \ |