projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util/vulkan: Move Vulkan utilities to src/vulkan/util
[mesa.git]
/
src
/
vulkan
/
Makefile.am
diff --git
a/src/vulkan/Makefile.am
b/src/vulkan/Makefile.am
index bd66901255db56395a5279cf0f0013eb7e8bb9e2..c897a07d6a8b33c3cb36234e1a35de271924c9be 100644
(file)
--- a/
src/vulkan/Makefile.am
+++ b/
src/vulkan/Makefile.am
@@
-11,6
+11,10
@@
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
EXTRA_DIST = \
util/gen_enum_to_str.py
EXTRA_DIST = \
util/gen_enum_to_str.py
+VULKAN_UTIL_SOURCES = \
+ $(VULKAN_UTIL_FILES) \
+ $(VULKAN_UTIL_GENERATED_FILES)
+
BUILT_SOURCES = \
$(VULKAN_UTIL_GENERATED_FILES)
BUILT_SOURCES = \
$(VULKAN_UTIL_GENERATED_FILES)
@@
-18,12
+22,13
@@
util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py $(vulkan_ap
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py --xml $(vulkan_api_xml) --outdir $(top_builddir)/src/vulkan/util
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py --xml $(vulkan_api_xml) --outdir $(top_builddir)/src/vulkan/util
-libvulkan_util_la_SOURCES = $(VULKAN_UTIL_
GENERATED_FIL
ES)
+libvulkan_util_la_SOURCES = $(VULKAN_UTIL_
SOURC
ES)
AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/vulkan/util \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include
@@
-31,8
+36,6
@@
AM_CFLAGS = \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
-VULKAN_LIB_DEPS =
-
VULKAN_WSI_SOURCES = \
$(VULKAN_WSI_FILES)
VULKAN_WSI_SOURCES = \
$(VULKAN_WSI_FILES)
@@
-43,9
+46,6
@@
AM_CPPFLAGS += \
-DVK_USE_PLATFORM_XLIB_KHR
VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES)
-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
BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES)
endif
BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES)
@@
-71,8
+71,6
@@
VULKAN_WSI_SOURCES += \
$(VULKAN_WSI_WAYLAND_FILES) \
$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
$(VULKAN_WSI_WAYLAND_FILES) \
$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
-VULKAN_LIB_DEPS += \
- $(WAYLAND_LIBS)
endif
libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES)
endif
libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES)