XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
This commit is contained in:
parent
af238e99da
commit
4545ba91e9
|
@ -1748,8 +1748,7 @@ if test "x$XQUARTZ" = xyes; then
|
||||||
AC_DEFINE(XQUARTZ,1,[Have Quartz])
|
AC_DEFINE(XQUARTZ,1,[Have Quartz])
|
||||||
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
|
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
|
||||||
|
|
||||||
DARWIN_GLX_LIBS='$(top_builddir)/hw/xquartz/GL/libCGLCore.la $(top_builddir)/glx/libglx.la'
|
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
|
||||||
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $DARWIN_GLX_LIBS"
|
|
||||||
AC_SUBST([DARWIN_LIBS])
|
AC_SUBST([DARWIN_LIBS])
|
||||||
|
|
||||||
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
||||||
|
|
|
@ -9,7 +9,8 @@ AM_CPPFLAGS = \
|
||||||
-DXFree86Server \
|
-DXFree86Server \
|
||||||
-I$(top_srcdir)/miext/rootless
|
-I$(top_srcdir)/miext/rootless
|
||||||
|
|
||||||
SUBDIRS = bundle . GL xpr mach-startup doc
|
# GL
|
||||||
|
SUBDIRS = bundle . xpr mach-startup doc
|
||||||
|
|
||||||
libXquartz_la_SOURCES = \
|
libXquartz_la_SOURCES = \
|
||||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||||
|
|
|
@ -21,6 +21,9 @@ X11_LDADD = \
|
||||||
$(top_builddir)/miext/rootless/librootless.la \
|
$(top_builddir)/miext/rootless/librootless.la \
|
||||||
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
|
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
|
||||||
|
|
||||||
|
# $(top_builddir)/hw/xquartz/GL/libCGLCore.la \
|
||||||
|
# $(top_builddir)/glx/libglx.la \
|
||||||
|
|
||||||
X11_LDFLAGS = \
|
X11_LDFLAGS = \
|
||||||
-XCClinker -Objc \
|
-XCClinker -Objc \
|
||||||
-Wl,-u,_miDCInitialize \
|
-Wl,-u,_miDCInitialize \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user