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

ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a. 

The former works, the later doesn't (DMX blows up on visuals/pixel formats).
This undos Daniel's patch, which undid my prev patch.  Revisit someday.
This commit is contained in:
Brian 2007-03-30 12:49:34 -06:00
parent 76756f2756
commit 9f24798af5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/dmx/Makefile.am
View File

@ -2,7 +2,6 @@ DIST_SUBDIRS = input config glxProxy examples doc
SUBDIRS = input config examples SUBDIRS = input config examples
bin_PROGRAMS = Xdmx bin_PROGRAMS = Xdmx
noinst_LIBRARIES = libfbcmap.a
if XINERAMA if XINERAMA
PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c
@ -17,6 +16,9 @@ GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \
GLX_DEFS = @GL_CFLAGS@ GLX_DEFS = @GL_CFLAGS@
endif endif
# It's essential that fbcmap.c be compiled with this flag for DMX to work!!
DMX_CFLAGS = -DXFree86Server=1
if BUILDDOCS if BUILDDOCS
SUBDIRS += doc SUBDIRS += doc
endif endif
@ -26,11 +28,9 @@ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
$(GLX_INCS) \ $(GLX_INCS) \
$(GLX_DEFS) \ $(GLX_DEFS) \
$(DMX_CFLAGS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
libfbcmap_a_SOURCES = libfbcmap.a
libfbcmap_a_CFLAGS = $(AM_CFLAGS) -DXFree86Server
Xdmx_SOURCES = dmx.c \ Xdmx_SOURCES = dmx.c \
dmxcb.c \ dmxcb.c \
dmxcb.h \ dmxcb.h \
@ -76,6 +76,7 @@ Xdmx_SOURCES = dmx.c \
dmxwindow.c \ dmxwindow.c \
dmxwindow.h \ dmxwindow.h \
$(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/mi/miinitext.c \
$(top_srcdir)/fb/fbcmap.c \
$(GLX_SRCS) $(GLX_SRCS)
@ -89,7 +90,6 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
$(GLX_LIBS) \ $(GLX_LIBS) \
input/libdmxinput.a \ input/libdmxinput.a \
config/libdmxconfig.a \ config/libdmxconfig.a \
libfbcmap.a \
@DMXMODULES_LIBS@ @DMXMODULES_LIBS@
# Man page # Man page