diff options
| author | Jason Ekstrand <[email protected]> | 2015-09-04 20:02:36 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-09-04 20:02:38 -0700 |
| commit | 01924a03d483d44c34e285e81a8cb875887c5805 (patch) | |
| tree | 1c3e4499165a66ebff1bd10554479a64d2e0c233 /src/vulkan/Makefile.am | |
| parent | 2c4ae00db693b066c479150998ca618265bf9d5c (diff) | |
vk: Actually link in wayland libraries
Turns out this was why I had accidentally broken the universe. Oops...
Diffstat (limited to 'src/vulkan/Makefile.am')
| -rw-r--r-- | src/vulkan/Makefile.am | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index b2eb4fb1cb1..8b17af22eb4 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -42,7 +42,6 @@ AM_CPPFLAGS = \ $(DEFINES) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ @@ -83,8 +82,26 @@ VULKAN_SOURCES = \ gen7_cmd_buffer.c \ gen7_pipeline.c +BUILT_SOURCES = \ + anv_entrypoints.h \ + anv_entrypoints.c \ + anv_meta_spirv_autogen.h + if HAVE_EGL_PLATFORM_WAYLAND -VULKAN_SOURCES += anv_wsi_wayland.c +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 < $< > $@ + +%-client-protocol.h : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ + +AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm +VULKAN_SOURCES += \ + wayland-drm-protocol.c \ + anv_wsi_wayland.c libvulkan_la_CFLAGS += -DHAVE_WAYLAND_PLATFORM endif @@ -92,11 +109,6 @@ libvulkan_la_SOURCES = \ $(VULKAN_SOURCES) \ anv_gem.c -BUILT_SOURCES = \ - anv_entrypoints.h \ - anv_entrypoints.c \ - anv_meta_spirv_autogen.h - anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS) $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@ @@ -108,7 +120,7 @@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS) CLEANFILES = $(BUILT_SOURCES) -libvulkan_la_LIBADD = -lxcb -lxcb-dri3 \ +libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \ $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la # Libvulkan with dummy gem. Used for unit tests. |