summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2006-09-23 10:35:25 -0600
committerAdam Jackson <ajax@benzedrine.nwnk.net>2006-10-11 16:01:37 -0400
commit32c293aa1c718b4884b803ec528afd2911454994 (patch)
treebbebe9c565a8be6b9a6fbd3ef2b4ef1ce0753df0 /hw/dmx
parent26a94bab11033c1746962ffba6de57cfbec6f3be (diff)
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors. (cherry picked from 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8 commit)
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index d36647b54..89136b904 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -16,6 +16,9 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \
GLX_DEFS = @GL_CFLAGS@
endif
+# It's essential that fbcmap.c be compiled with this flag for DMX to work!!
+DMX_CFLAGS = -DXFree86Server=1
+
if BUILDDOCS
SUBDIRS += doc
endif
@@ -86,6 +89,7 @@ Xdmx_CFLAGS = \
$(DIX_CFLAGS) \
$(GLX_INCS) \
$(GLX_DEFS) \
+ $(DMX_CFLAGS) \
@DMXMODULES_CFLAGS@
# Man page