summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-03-20 14:56:03 +0000
committerEmil Velikov <[email protected]>2017-03-22 11:32:54 +0000
commit1fa6a33e4de112a8fa5f9b5b85c9463d18617ebe (patch)
tree7db38b1beb3231e1cf49a0b5d931d3f071500afc /src
parentc11dcfb5e9b051b9036949b3e40a9dc15138bd97 (diff)
anv: automake: use the local headers over any system provided ones
At the moment, we would honour any system headers - vulkan_intel.h in particular over the ones in-tree. Thus, if one does incremental build of mesa, without the vulkan.h already installed (or at least not in the same directory as vulkan_intel.h) the build will fail. In the future we might want to upstream the vulkan_intel.h within vulkan.h or use other ways to make vulkan_intel.h obsolete. In either case, the more robust thing is to rely on our own copy. v2: Move AM_CPPFLAGS just above LIBDRM_CFLAGS (Grazvydas, Jason) Tested-by: Grazvydas Ignotas <[email protected]> Fixes: ee8044fd "intel/vulkan: Get rid of recursive make" Suggested-by: Jason Ekstrand <[email protected]> Reported-by: Grazvydas Ignotas <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/intel/Makefile.vulkan.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index 185780246e2..28150098769 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -92,8 +92,8 @@ VULKAN_CPPFLAGS = \
-I$(top_srcdir)/src/vulkan/wsi \
-I$(top_builddir)/src/vulkan/util \
-I$(top_srcdir)/src/vulkan/util \
- $(LIBDRM_CFLAGS) \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS) \
+ $(LIBDRM_CFLAGS)
vulkan_libanv_gen7_la_CFLAGS = $(VULKAN_CFLAGS)
vulkan_libanv_gen7_la_CPPFLAGS = $(VULKAN_CPPFLAGS) -DGEN_VERSIONx10=70