diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 23:28:15 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | 9bc99f56682721261fec90568255dc9b937faa7c (patch) | |
| tree | 7994abd144158f4494ccae595a2585d0405211b5 | |
| parent | 3a2d09dd654fffb17a50699ac5fb293cb6be6e84 (diff) | |
anv: refactor wayland build handling
Rather than having things split out in multiple places, consolidate it
and add all the missing bits. Also ensure that we use the already built
static library libwayland-drm.la.
v2 Add missing '\' in the CFLAGS.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Jason Ekstrand <[email protected]> (v1)
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 89d7a07fbf9..fc221705657 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -92,29 +92,26 @@ libanv_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 libanv_gen9_la_SOURCES = $(GEN9_FILES) if HAVE_EGL_PLATFORM_WAYLAND -BUILT_SOURCES += \ - wayland-drm-protocol.c \ - wayland-drm-client-protocol.h - -%-protocol.c : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ +VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR -%-client-protocol.h : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ +AM_CPPFLAGS += \ + -I$(top_builddir)/src/egl/wayland/wayland-drm \ + -I$(top_srcdir)/src/egl/wayland/wayland-drm \ + $(WAYLAND_CFLAGS) \ + -DVK_USE_PLATFORM_WAYLAND_KHR \ + -DHAVE_WAYLAND_PLATFORM -AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm -VULKAN_SOURCES += \ - wayland-drm-protocol.c \ - $(VULKAN_WSI_WAYLAND_FILES) -AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR +VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) -VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR +VULKAN_LIB_DEPS += \ + $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \ + $(WAYLAND_LIBS) endif noinst_LTLIBRARIES += libvulkan_common.la libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) -VULKAN_LIB_DEPS += $(WAYLAND_LIBS) \ +VULKAN_LIB_DEPS += \ libvulkan_common.la \ -lxcb -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence \ $(top_builddir)/src/intel/isl/libisl.la \ |