KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <notasas@gmail.com>
Fixes: ee8044fd "intel/vulkan: Get rid of recursive make"
Suggested-by: Jason Ekstrand <jason@jlekstrand.net>
Reported-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Emil Velikov 2017-03-20 14:56:03 +00:00 committed by Emil Velikov
parent c11dcfb5e9
commit 1fa6a33e4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/Makefile.vulkan.am
View File

@ -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