aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/Automake.inc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-08-30 13:45:43 +0200
committermarha <marha@users.sourceforge.net>2014-08-30 13:45:43 +0200
commit3293021e6f582c7348667e7638941620134525e1 (patch)
tree5d8d3da8242ff7828fb6964bed19b13d74d48704 /mesalib/src/gallium/Automake.inc
parent0a9ab140bb01b96888e313466a73e26e5156f22d (diff)
parente21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff)
downloadvcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz
vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2
vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/hw/kdrive/ephyr/ephyrinit.c
Diffstat (limited to 'mesalib/src/gallium/Automake.inc')
-rw-r--r--mesalib/src/gallium/Automake.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc
index 74053eb2d..c43f735c3 100644
--- a/mesalib/src/gallium/Automake.inc
+++ b/mesalib/src/gallium/Automake.inc
@@ -16,6 +16,7 @@ GALLIUM_DRIVER_CFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/src/gallium/winsys \
$(DEFINES) \
$(VISIBILITY_CFLAGS)
@@ -26,6 +27,7 @@ GALLIUM_DRIVER_CXXFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/src/gallium/winsys \
$(DEFINES) \
$(VISIBILITY_CXXFLAGS)