diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 19:15:18 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | 6dc169e18f6991836be5172adae7c5766cda3366 (patch) | |
| tree | 9227c46241f946d5a8bde5caeccd352c8b16a6c3 /src/intel/vulkan/Makefile.am | |
| parent | cbc4837b83157fd990ac5960badaba342be6cb33 (diff) | |
anv: factor out the X11/XCB build
Similar to earlier commit - move all the common bits into a single
place, thus improving readability and allowing us to see what's missing.
Also don't forget to add the missing bits. This commit should allows us
to build wayland only vulkan ;-)
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/intel/vulkan/Makefile.am')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 98784aa2714..5289860b504 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -30,8 +30,7 @@ vulkan_include_HEADERS = \ # Used when generating entrypoints to filter out unwanted extensions VULKAN_ENTRYPOINT_CPPFLAGS = \ - -I$(top_srcdir)/include/vulkan \ - -DVK_USE_PLATFORM_XCB_KHR + -I$(top_srcdir)/include/vulkan lib_LTLIBRARIES = libvulkan_intel.la @@ -66,12 +65,11 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/intel -AM_CFLAGS = -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2 +AM_CFLAGS = -Wno-override-init -msse2 VULKAN_SOURCES = \ $(VULKAN_GENERATED_FILES) \ - $(VULKAN_FILES) \ - $(VULKAN_WSI_X11_FILES) + $(VULKAN_FILES) VULKAN_LIB_DEPS = @@ -91,6 +89,20 @@ libanv_gen8_la_SOURCES = $(GEN8_FILES) libanv_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 libanv_gen9_la_SOURCES = $(GEN9_FILES) + +if HAVE_EGL_PLATFORM_X11 +VULKAN_ENTRYPOINT_CPPFLAGS += \ + -DVK_USE_PLATFORM_XCB_KHR + +AM_CPPFLAGS += \ + $(XCB_DRI3_CFLAGS) \ + -DVK_USE_PLATFORM_XCB_KHR + +VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES) +VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) +endif + + if HAVE_EGL_PLATFORM_WAYLAND VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR @@ -112,7 +124,6 @@ libvulkan_common_la_SOURCES = $(VULKAN_SOURCES) VULKAN_LIB_DEPS += \ libvulkan_common.la \ - -lxcb -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence \ $(top_builddir)/src/intel/isl/libisl.la \ $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ $(top_builddir)/src/mesa/libmesa.la \ |