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

Added Mesa include directory

This commit is contained in:
Alexander Gottwald 2006-02-22 16:08:56 +00:00
parent 43fbcc28c9
commit 43324132af
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2006-02-21 Jeremy C. Reed <reed@reedmedia.net>
* GL/mesa/shader/slang/Makefile.am: * GL/mesa/shader/slang/Makefile.am:

5
hw/dmx/Makefile.am
View File

@ -11,7 +11,9 @@ if GLX
SUBDIRS += glxProxy SUBDIRS += glxProxy
GLX_LIBS = glxProxy/libglxproxy.a GLX_LIBS = glxProxy/libglxproxy.a
GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c dmx_glxvisuals.h 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 endif
if BUILDDOCS if BUILDDOCS
@ -82,6 +84,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
Xdmx_CFLAGS = @SERVER_DEFINES@ \ Xdmx_CFLAGS = @SERVER_DEFINES@ \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
$(GLX_INCS) \ $(GLX_INCS) \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
# Man page # Man page

7
hw/dmx/config/Makefile.am
View File

@ -20,12 +20,19 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES)
libdmxconfig_a_SOURCES = $(LIBSRCS) libdmxconfig_a_SOURCES = $(LIBSRCS)
if GLX
GLX_DEFS = @GL_CFLAGS@
GLX_INCS = -I@MESA_SOURCE@/include
endif
AM_YFLAGS = -d AM_YFLAGS = -d
AM_CFLAGS = \ AM_CFLAGS = \
@SERVER_DEFINES@ \ @SERVER_DEFINES@ \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
$(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
-DDMX_LOG_STANDALONE \ -DDMX_LOG_STANDALONE \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx

7
hw/dmx/input/Makefile.am
View File

@ -55,10 +55,17 @@ libdmxinput_a_SOURCES = ChkNotMaskEv.c \
$(DMXSRCS) \ $(DMXSRCS) \
$(LIBSRCS) $(LIBSRCS)
if GLX
GLX_DEFS = @GL_CFLAGS@
GLX_INCS = -I@MESA_SOURCE@/include
endif
AM_CFLAGS = @SERVER_DEFINES@ \ AM_CFLAGS = @SERVER_DEFINES@ \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/common \
$(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
$(GLX_DEFS) \
@DMXMODULES_CFLAGS@ @DMXMODULES_CFLAGS@
EXTRA_DIST = dmxdetach.c EXTRA_DIST = dmxdetach.c