fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin
This commit is contained in:
parent
906c3195c9
commit
c213749b19
@ -1868,7 +1868,7 @@ if test "$KDRIVE" = yes; then
|
||||
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
|
||||
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
|
||||
|
||||
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
|
||||
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS -fno-common"
|
||||
|
||||
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB"
|
||||
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a'
|
||||
|
@ -259,7 +259,7 @@ main(int argc, char *argv[], char *envp[])
|
||||
/* Quartz support on Mac OS X requires that the Cocoa event loop be in
|
||||
* the main thread. This allows the X server main to be called again
|
||||
* from another thread. */
|
||||
#if defined(__DARWIN__) && defined(DARWIN_WITH_QUARTZ)
|
||||
#ifdef DARWIN_WITH_QUARTZ
|
||||
DarwinHandleGUI(argc, argv, envp);
|
||||
#endif
|
||||
|
||||
|
@ -22,7 +22,9 @@ if XPRINT
|
||||
XPRINT_SUBDIRS = xprint
|
||||
endif
|
||||
|
||||
if XDARWIN
|
||||
DARWIN_SUBDIRS = darwin
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
$(XORG_SUBDIRS) \
|
||||
|
@ -673,10 +673,10 @@ InitVisualWrap()
|
||||
{
|
||||
miResetInitVisuals();
|
||||
#ifdef GLXEXT
|
||||
#ifndef __DARWIN__
|
||||
GlxWrapInitVisuals(&miInitVisualsProc);
|
||||
#else
|
||||
#ifdef INXQUARTZ
|
||||
DarwinGlxWrapInitVisuals(&miInitVisualsProc);
|
||||
#else
|
||||
GlxWrapInitVisuals(&miInitVisualsProc);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user