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

Build libglx correctly when not building the Xorg DDX.

This commit is contained in:
Adam Jackson 2005-12-13 17:35:26 +00:00
parent b076dd787f
commit cf605eb916
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* Xext/Makefile.am: * Xext/Makefile.am:
Spell it XINERAMA_SRCS, not PANORAMIX_SRCS. Spell it XINERAMA_SRCS, not PANORAMIX_SRCS.
* GL/mesa/X/Makefile.am:
Build libglx correctly when not building the Xorg DDX.
2005-12-12 Alan Coopersmith <alan.coopersmith@sun.com> 2005-12-12 Alan Coopersmith <alan.coopersmith@sun.com>
* hw/xfree86/os-support/solaris/sun_kbdEv.c: * hw/xfree86/os-support/solaris/sun_kbdEv.c:

5
GL/mesa/X/Makefile.am
View File

@ -16,7 +16,10 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ # -DXFree86Server is required because the X11 driver in Mesa thinks that
# symbol means "being built in the server"
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-DXFree86Server
libX_la_SOURCES = xf86glx.c \ libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \ xf86glx_util.c \