diff options
author | Jason Ekstrand <[email protected]> | 2017-03-01 19:03:17 -0800 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2017-03-13 11:16:33 +0000 |
commit | 12f348bc987991f7014996841c5e37887bcae228 (patch) | |
tree | 7f922d2d848bd0c44218751b0cd5f36b90a2b4ef /src/intel | |
parent | 1d135e25617b2e321b7ebe5c443d3d6d191dee90 (diff) |
vulkan/wsi: Generate wayland protocol headers separately from EGL
Previously, we were depending on EGL for generating the headers and
providing the protocol symbols. However, since neither Vulkan driver
actually wants to link against EGL, this is kind of pointless. It also
creates a weird build dependency.
v2 [Jason]
- Add missing wsi/ prefix, MKDIR_GEN
v3 [Emil Velikov]
- include BUILT_SOURCES/generation rules outside of conditional
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r-- | src/intel/vulkan/Makefile.am | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 3cd01e4d028..6c902b52e10 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -63,12 +63,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/intel \ -I$(top_srcdir)/src/intel -if HAVE_PLATFORM_WAYLAND -AM_CPPFLAGS += \ - -I$(top_builddir)/src/egl/wayland/wayland-drm \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm -endif - AM_CPPFLAGS += \ $(LIBDRM_CFLAGS) \ $(INTEL_CFLAGS) \ @@ -119,7 +113,6 @@ AM_CPPFLAGS += \ VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) VULKAN_LIB_DEPS += \ - $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \ $(WAYLAND_LIBS) endif |