XQuartz: Initial work on readding GLX to the 1.5 server
This commit is contained in:
parent
b5bb6dbc8f
commit
a186cab6ae
|
@ -671,7 +671,6 @@ case $host_os in
|
||||||
XQUARTZ=yes
|
XQUARTZ=yes
|
||||||
XVFB=no
|
XVFB=no
|
||||||
XNEST=no
|
XNEST=no
|
||||||
GLX=no
|
|
||||||
|
|
||||||
COMPOSITE=no
|
COMPOSITE=no
|
||||||
DGA=no
|
DGA=no
|
||||||
|
|
|
@ -12,8 +12,10 @@ AM_CPPFLAGS = \
|
||||||
libCGLCore_la_SOURCES = \
|
libCGLCore_la_SOURCES = \
|
||||||
indirect.c \
|
indirect.c \
|
||||||
capabilities.c \
|
capabilities.c \
|
||||||
|
glcontextmodes.c \
|
||||||
visualConfigs.c
|
visualConfigs.c
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
capabilities.h \
|
capabilities.h \
|
||||||
|
glcontextmodes.h \
|
||||||
visualConfigs.h
|
visualConfigs.h
|
||||||
|
|
|
@ -9,8 +9,13 @@ AM_CPPFLAGS = \
|
||||||
-DXFree86Server \
|
-DXFree86Server \
|
||||||
-I$(top_srcdir)/miext/rootless
|
-I$(top_srcdir)/miext/rootless
|
||||||
|
|
||||||
# GL
|
if GLX
|
||||||
SUBDIRS = bundle . xpr mach-startup doc pbproxy
|
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 = \
|
libXquartz_la_SOURCES = \
|
||||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||||
|
|
|
@ -27,12 +27,20 @@ X11_LDFLAGS = \
|
||||||
-XCClinker -Objc \
|
-XCClinker -Objc \
|
||||||
-Wl,-u,_miDCInitialize \
|
-Wl,-u,_miDCInitialize \
|
||||||
-Wl,-framework,Carbon \
|
-Wl,-framework,Carbon \
|
||||||
-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
|
|
||||||
-Wl,-framework,OpenGL \
|
|
||||||
-Wl,-framework,Cocoa \
|
-Wl,-framework,Cocoa \
|
||||||
-Wl,-framework,CoreAudio \
|
-Wl,-framework,CoreAudio \
|
||||||
-Wl,-framework,IOKit
|
-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
|
bin_PROGRAMS = Xquartz
|
||||||
|
|
||||||
dist_Xquartz_SOURCES = \
|
dist_Xquartz_SOURCES = \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user