From: Emil Velikov Date: Fri, 27 May 2016 14:35:38 +0000 (+0100) Subject: anv: automake: bring back VULKAN_ENTRYPOINT_CPPFLAGS X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=220d8c99fa5c0f38371fb7cf11251de3e54ae2c0;p=mesa.git anv: automake: bring back VULKAN_ENTRYPOINT_CPPFLAGS We should not have removed them in the first place. There's a subtle difference between generating the complete sources and using them which was not obvious as we nuked them. Without this, the release tarball ends up without various hunks of the generated sources, thus things fail at a later stage as we attempt to build them. Signed-off-by: Emil Velikov Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index d59d8565048..cbbb9ed9e29 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -124,12 +124,16 @@ VULKAN_LIB_DEPS += \ nodist_EXTRA_libvulkan_intel_la_SOURCES = dummy.cpp libvulkan_intel_la_SOURCES = $(VULKAN_GEM_FILES) +VULKAN_ENTRYPOINT_CPPFLAGS = \ + -DVK_USE_PLATFORM_XCB_KHR \ + -DVK_USE_PLATFORM_WAYLAND_KHR + anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS) - $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\ + $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\ $(PYTHON2) $(srcdir)/anv_entrypoints_gen.py header > $@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS) - $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\ + $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\ $(PYTHON2) $(srcdir)/anv_entrypoints_gen.py code > $@ BUILT_SOURCES = $(VULKAN_GENERATED_FILES)