summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-10-14 17:14:41 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-10-15 21:50:09 +0200
commitcd3fa176a8dbae3e14c9426e7fbe13baa6e84256 (patch)
tree786e9a3ed1c6e454e319c009009c3a61ce727da4
parent467e3aa3de0e1f5b357975d35c1312f7566af577 (diff)
downloadexternal_mesa3d-cd3fa176a8dbae3e14c9426e7fbe13baa6e84256.zip
external_mesa3d-cd3fa176a8dbae3e14c9426e7fbe13baa6e84256.tar.gz
external_mesa3d-cd3fa176a8dbae3e14c9426e7fbe13baa6e84256.tar.bz2
swrast: add correct include for out-of-tree builds
The xmlpool/options.h file was not accessible when building out-of-tree leading to failure. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70378 Reported-by: Fabio Pedretti <fabio.ped@libero.it> Tested-by: Fabio Pedretti <fabio.ped@libero.it> Tested-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
-rw-r--r--src/gallium/targets/dri-swrast/Makefile.am1
-rw-r--r--src/mesa/drivers/dri/swrast/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index 5d2f146..6b629df 100644
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -33,6 +33,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mapi \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
-DGALLIUM_SOFTPIPE \
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
index 9652583..c51ad2d 100644
--- a/src/mesa/drivers/dri/swrast/Makefile.am
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -30,6 +30,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
+ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS)