diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-12-13 17:35:26 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-12-13 17:35:26 +0000 |
| commit | cf605eb91619a8c0589a08674ffc3e018471b3fc (patch) | |
| tree | 004ec7b73fff84758d6cac64dd2640a9c70b6ecf | |
| parent | b076dd787ff71c4b385ab4e2e4eb367f3de378f6 (diff) | |
Build libglx correctly when not building the Xorg DDX.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | GL/mesa/X/Makefile.am | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -3,6 +3,9 @@ * Xext/Makefile.am: 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> * hw/xfree86/os-support/solaris/sun_kbdEv.c: diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index 46b7e82f2..e51f9e8f3 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -16,7 +16,10 @@ INCLUDES = -I@MESA_SOURCE@/include \ -I$(top_srcdir)/GL/include \ -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 \ xf86glx_util.c \ |