frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more defines for XWin DDX Make building of cfb*, afb and mfb 

conditional Set FD_SETSIZE=256 on cygwin
This commit is contained in:
Alexander Gottwald 2005-07-05 23:01:51 +00:00
parent 71ed3ae0c6
commit 6ba4a2e78a
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-07-06 Alexander Gottwald <ago@freedesktop.org>
* configure.ac:
* Makefile.am:
* include/dix-config.h:
Add more defines for XWin DDX
Make building of cfb*, afb and mfb conditional
Set FD_SETSIZE=256 on cygwin
2005-07-05 Alexander Gottwald <ago@freedesktop.org> 2005-07-05 Alexander Gottwald <ago@freedesktop.org>
* hw/xwin/Makefile.am: * hw/xwin/Makefile.am:

30
Makefile.am
View File

@ -6,6 +6,18 @@ endif
if XTRAP if XTRAP
XTRAP_DIR=XTrap XTRAP_DIR=XTrap
endif endif
if CFB
CFB_DIR=cfb
CFB16_DIR=cfb16
CFB24_DIR=cfb24
CFB32_DIR=cfb32
endif
if AFB
AFB_DIR=afb
endif
if MFB
MFB_DIR=mfb
endif
SUBDIRS= \ SUBDIRS= \
include \ include \
@ -17,19 +29,19 @@ SUBDIRS= \
os \ os \
randr \ randr \
render \ render \
Xi \ Xi \
mfb \ xkb \
xkb \ $(MFB_DIR) \
afb \ $(AFB_DIR) \
cfb \ $(CFB_DIR) \
cfb16 \ $(CFB16_DIR) \
cfb24 \ $(CFB24_DIR) \
cfb32 \ $(CFB32_DIR) \
record \ record \
xfixes \ xfixes \
damageext \ damageext \
$(XTRAP_DIR) \ $(XTRAP_DIR) \
$(COMPOSITE_DIR) \ $(COMPOSITE_DIR) \
hw hw
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

12
configure.ac
View File

@ -233,6 +233,8 @@ if test "$XWIN" = yes; then
cygwin*) cygwin*)
PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages]) AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
CFLAGS="$CFLAGS -DFD_SETSIZE=256"
;; ;;
mingw*) mingw*)
PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont]) PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
@ -264,6 +266,10 @@ if test "$XWIN" = yes; then
AC_MSG_NOTICE([Disabling XF86Misc extension]) AC_MSG_NOTICE([Disabling XF86Misc extension])
XF86MISC=no XF86MISC=no
fi fi
if test "$COMPOSITE" = yes; then
AC_MSG_NOTICE([Disabling Composite extension])
COMPOSITE=no
fi
fi fi
AM_CONDITIONAL(XWIN, [test x$XWIN = xyes]) AM_CONDITIONAL(XWIN, [test x$XWIN = xyes])
AM_CONDITIONAL(XWIN_MULTIWINDOW, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_MULTIWINDOW, [test x$XWIN = xyes && true])
@ -271,10 +277,14 @@ AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test x$XWIN = xyes && false])
AM_CONDITIONAL(XWIN_CLIPBOARD, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_CLIPBOARD, [test x$XWIN = xyes && true])
AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test x$XWIN = xyes && false]) AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test x$XWIN = xyes && false])
AM_CONDITIONAL(XWIN_NATIVEGDI, [test x$XWIN = xyes && false]) AM_CONDITIONAL(XWIN_NATIVEGDI, [test x$XWIN = xyes && false])
AM_CONDITIONAL(XWIN_PRIMARYFB, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_PRIMARYFB, [test x$XWIN = xyes && false])
AM_CONDITIONAL(XWIN_RANDR, [test x$XWIN = xyes && true]) AM_CONDITIONAL(XWIN_RANDR, [test x$XWIN = xyes && true])
AM_CONDITIONAL(XWIN_XV, [test x$XWIN = xyes -a x$XV = xyes]) AM_CONDITIONAL(XWIN_XV, [test x$XWIN = xyes -a x$XV = xyes])
AM_CONDITIONAL(MFB, [test x$XORG = xyes])
AM_CONDITIONAL(CFB, [test x$XORG = xyes])
AM_CONDITIONAL(AFB, [test x$XORG = xyes])
AM_CONDITIONAL(XV, [test x$XV = xyes]) AM_CONDITIONAL(XV, [test x$XV = xyes])
if test "$XV" = yes; then if test "$XV" = yes; then
AC_DEFINE(XV,1,[Support Xv Extension]) AC_DEFINE(XV,1,[Support Xv Extension])

3
include/dix-config.h.in
View File

@ -356,3 +356,6 @@
/* Define to `int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#undef pid_t #undef pid_t
/* Build Rootless code */
#undef ROOTLESS