[PATCH vkd3d 2/7] build: Do not build libvkd3d-shader as public library.
Józef Kucia
joseph.kucia at gmail.com
Mon Jan 15 06:49:02 CST 2018
From: Józef Kucia <jkucia at codeweavers.com>
libvkd3d-shader interface is expected to be extended significantly.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
I think it's reasonable to exclude the library from the first release.
It will give us more time to develop the library and stabilize the API.
It should be quite easy to restore the library in the future release
when we need it, e.g. wined3d could use it.
Let's limit the API which we have to get right in the first release ;-)
---
Makefile.am | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 190a7ac8d134..15a1783edc03 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ vkd3d_public_headers = \
include/vkd3d_d3d12.h \
include/vkd3d_dxgibase.h \
include/vkd3d_dxgiformat.h \
- include/vkd3d_shader.h \
include/vkd3d_utils.h \
include/vkd3d_windows.h
@@ -49,13 +48,13 @@ vkd3d_demos_headers = \
BUILT_SOURCES = $(widl_headers)
-noinst_LTLIBRARIES = libvkd3d-common.la
+noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la
libvkd3d_common_la_SOURCES = \
include/private/vkd3d_debug.h \
libs/vkd3d-common/debug.c \
libs/vkd3d-common/memory.c
-lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la
+lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la
libvkd3d_shader_la_SOURCES = \
include/private/list.h \
@@ -67,7 +66,7 @@ libvkd3d_shader_la_SOURCES = \
libs/vkd3d-shader/spirv.c \
libs/vkd3d-shader/vkd3d_shader_main.c \
libs/vkd3d-shader/vkd3d_shader_private.h
-libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@
+libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@
if HAVE_LD_VERSION_SCRIPT
libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
endif
@@ -110,7 +109,7 @@ EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in
bin_PROGRAMS = vkd3d-compiler
vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
-vkd3d_compiler_LDADD = libvkd3d-shader.la
+vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la
LDADD = libvkd3d.la libvkd3d-utils.la
check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
--
2.13.6
More information about the wine-devel
mailing list