summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorDan Nicholson <[email protected]>2010-04-19 20:22:48 -0700
committerDan Nicholson <[email protected]>2010-04-19 20:22:48 -0700
commit02224ec4e0de8072c9d730821f88e0a00212ff50 (patch)
tree565fe9ab2c6380cd81ead1ef468888a837c2edd5 /src/gallium/state_trackers
parent35e60aed0bcc63d906dfdd64fe5014b2ca4394f0 (diff)
parent88be2171e7336201e5ee97ade36ba3de4fe939bf (diff)
Merge branch '7.8'
Conflicts: progs/egl/Makefile progs/egl/Makefile is gone on master with the egl demos split into subdirectories. Will require an additional commit.
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/egl/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 794785006f5..1768241352f 100644
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -16,6 +16,7 @@ x11_INCLUDES = \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/glx \
-I$(TOP)/src/mesa \
+ $(X11_CFLAGS) \
$(shell pkg-config --cflags-only-I libdrm)
x11_SOURCES = $(wildcard x11/*.c) \