diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
| commit | 097c0d8400d976c5c372db576a11764e87994c7f (patch) | |
| tree | b5f977f9277f70f94f22ef221602ed318592a912 /mesalib/src/mesa/drivers/dri/Makefile.defines | |
| parent | 03fa24f76277662240d0af8770e168fc38b533cb (diff) | |
| parent | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff) | |
| download | vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.gz vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.bz2 vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/i18n/trans/trans.xml
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_print_visitor.cpp
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/rules/xkb.dtd
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/Makefile.defines')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/Makefile.defines | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/dri/Makefile.defines b/mesalib/src/mesa/drivers/dri/Makefile.defines new file mode 100644 index 000000000..19b6de8b8 --- /dev/null +++ b/mesalib/src/mesa/drivers/dri/Makefile.defines @@ -0,0 +1,34 @@ +# -*-makefile-*- + +COMMON_GALLIUM_SOURCES = \ + ../common/utils.c \ + ../common/vblank.c \ + ../common/dri_util.c \ + ../common/xmlconfig.c + +COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \ + ../../common/driverfuncs.c \ + ../common/texmem.c \ + ../common/drirenderbuffer.c + +INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) + +OBJECTS = $(C_SOURCES:.c=.o) \ + $(CXX_SOURCES:.cpp=.o) \ + $(ASM_SOURCES:.S=.o) + + +### Include directories +SHARED_INCLUDES = \ + -I. \ + -I$(TOP)/src/mesa/drivers/dri/common \ + -Iserver \ + -I$(TOP)/include \ + -I$(TOP)/src/mapi \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/egl/main \ + -I$(TOP)/src/egl/drivers/dri \ + $(LIBDRM_CFLAGS) + +INCLUDES += $(API_DEFINES) +CXXFLAGS += $(API_DEFINES) |