summaryrefslogtreecommitdiffstats
path: root/src/vulkan/wsi
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-02-17 11:57:24 -0800
committerDylan Baker <dylan@pnwbakers.com>2017-02-22 13:12:02 -0800
commit8e03250fcf4fc5de31e92ca4919959d932888a69 (patch)
treef231bc72a0b738c981a4871f0cd7c82308db38c6 /src/vulkan/wsi
parente9dcb17962f7e58a81c93bae7bd33885675b1043 (diff)
vulkan: Combine wsi and util makefiles
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/vulkan/wsi')
-rw-r--r--src/vulkan/wsi/Makefile.am50
-rw-r--r--src/vulkan/wsi/Makefile.sources12
2 files changed, 0 insertions, 62 deletions
diff --git a/src/vulkan/wsi/Makefile.am b/src/vulkan/wsi/Makefile.am
deleted file mode 100644
index b5ccf986ac3..00000000000
--- a/src/vulkan/wsi/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-
-include Makefile.sources
-
-vulkan_includedir = $(includedir)/vulkan
-
-noinst_LTLIBRARIES = libvulkan_wsi.la
-
-AM_CPPFLAGS = \
- $(DEFINES) \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/gallium/auxiliary \
- -I$(top_srcdir)/src/gallium/include
-
-AM_CFLAGS = \
- $(LIBDRM_CFLAGS) \
- $(VISIBILITY_CFLAGS)
-
-VULKAN_LIB_DEPS =
-
-VULKAN_WSI_SOURCES = \
- $(VULKAN_WSI_FILES)
-
-if HAVE_PLATFORM_X11
-AM_CPPFLAGS += \
- $(XCB_DRI3_CFLAGS) \
- -DVK_USE_PLATFORM_XCB_KHR \
- -DVK_USE_PLATFORM_XLIB_KHR
-
-VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES)
-
-# FIXME: Use pkg-config for X11-xcb ldflags.
-VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb
-endif
-
-if HAVE_PLATFORM_WAYLAND
-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
-
-VULKAN_WSI_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
-
-VULKAN_LIB_DEPS += \
- $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
- $(WAYLAND_LIBS)
-endif
-
-libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES)
diff --git a/src/vulkan/wsi/Makefile.sources b/src/vulkan/wsi/Makefile.sources
deleted file mode 100644
index 50660f9a541..00000000000
--- a/src/vulkan/wsi/Makefile.sources
+++ /dev/null
@@ -1,12 +0,0 @@
-
-VULKAN_WSI_FILES := \
- wsi_common.h \
- wsi_common_queue.h
-
-VULKAN_WSI_WAYLAND_FILES := \
- wsi_common_wayland.c \
- wsi_common_wayland.h
-
-VULKAN_WSI_X11_FILES := \
- wsi_common_x11.c \
- wsi_common_x11.h \ No newline at end of file