diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2006-02-22 16:08:56 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2006-02-22 16:08:56 +0000 |
| commit | 43324132afcbb6b231efcc24ec72ee44678d5771 (patch) | |
| tree | 2d5ced59bd111e9a7f97a6b7a5c24e8f430bcb7b | |
| parent | 43fbcc28c960ce5abe1d3223441c3dc5a10cde27 (diff) | |
Added Mesa include directory
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | hw/dmx/Makefile.am | 5 | ||||
| -rw-r--r-- | hw/dmx/config/Makefile.am | 7 | ||||
| -rw-r--r-- | hw/dmx/input/Makefile.am | 7 |
4 files changed, 26 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2006-02-22 Alexander Gottwald <ago@starnet.com> + + * hw/dmx/Makefile.am: + * hw/dmx/input/Makefile.am: + * hw/dmx/config/Makefile.am: + + Added Mesa include directory + 2006-02-21 Jeremy C. Reed <reed@reedmedia.net> * GL/mesa/shader/slang/Makefile.am: diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index dc5323203..93abd7a0e 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -11,7 +11,9 @@ if GLX SUBDIRS += glxProxy GLX_LIBS = glxProxy/libglxproxy.a GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h -GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod +GLX_INCS = -I$(top_srcdir)/hw/xfree86/dixmods/extmod \ + -I@MESA_SOURCE@/include +GLX_DEFS = @GL_CFLAGS@ endif if BUILDDOCS @@ -82,6 +84,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ Xdmx_CFLAGS = @SERVER_DEFINES@ \ -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ + $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ # Man page diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index e2ea56efc..7376ec23a 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -20,12 +20,19 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) libdmxconfig_a_SOURCES = $(LIBSRCS) +if GLX +GLX_DEFS = @GL_CFLAGS@ +GLX_INCS = -I@MESA_SOURCE@/include +endif + AM_YFLAGS = -d AM_CFLAGS = \ @SERVER_DEFINES@ \ -I$(top_srcdir)/hw/dmx \ + $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ -DDMX_LOG_STANDALONE \ + $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index 197b8412e..d37c2a9ce 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -55,10 +55,17 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \ $(DMXSRCS) \ $(LIBSRCS) +if GLX +GLX_DEFS = @GL_CFLAGS@ +GLX_INCS = -I@MESA_SOURCE@/include +endif + AM_CFLAGS = @SERVER_DEFINES@ \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/xfree86/common \ + $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ + $(GLX_DEFS) \ @DMXMODULES_CFLAGS@ EXTRA_DIST = dmxdetach.c |