wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

build: Build libvkd3d-shader as public library.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-11-01 22:39:30 +01:00 committed by Alexandre Julliard
parent 00a0958526
commit c2e0bf1244
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile.am
View File

@ -19,6 +19,7 @@ vkd3d_public_headers = \
include/vkd3d_d3dcommon.h \ include/vkd3d_d3dcommon.h \
include/vkd3d_dxgibase.h \ include/vkd3d_dxgibase.h \
include/vkd3d_dxgiformat.h \ include/vkd3d_dxgiformat.h \
include/vkd3d_shader.h \
include/vkd3d_utils.h \ include/vkd3d_utils.h \
include/vkd3d_windows.h include/vkd3d_windows.h
@ -51,13 +52,13 @@ vkd3d_demos_headers = \
BUILT_SOURCES = $(widl_headers) BUILT_SOURCES = $(widl_headers)
noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la noinst_LTLIBRARIES = libvkd3d-common.la
libvkd3d_common_la_SOURCES = \ libvkd3d_common_la_SOURCES = \
include/private/vkd3d_debug.h \ include/private/vkd3d_debug.h \
libs/vkd3d-common/debug.c \ libs/vkd3d-common/debug.c \
libs/vkd3d-common/memory.c libs/vkd3d-common/memory.c
lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la
libvkd3d_shader_la_SOURCES = \ libvkd3d_shader_la_SOURCES = \
include/private/list.h \ include/private/list.h \
@ -73,9 +74,10 @@ libvkd3d_shader_la_SOURCES = \
libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_main.c \
libs/vkd3d-shader/vkd3d_shader_private.h libs/vkd3d-shader/vkd3d_shader_private.h
libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) @SPIRV_TOOLS_CFLAGS@
libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ libvkd3d_shader_la_LDFLAGS = -version-info 1:0:0
libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
endif endif
libvkd3d_la_SOURCES = \ libvkd3d_la_SOURCES = \
@ -116,13 +118,16 @@ EXTRA_DIST = LICENSE
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkginclude_HEADERS = $(vkd3d_public_headers) pkginclude_HEADERS = $(vkd3d_public_headers)
nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-utils.pc nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc
CLEANFILES = libvkd3d.pc libvkd3d-utils.pc CLEANFILES = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc
EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in EXTRA_DIST += \
libs/vkd3d/libvkd3d.pc.in \
libs/vkd3d-shader/libvkd3d-shader.pc.in \
libs/vkd3d-utils/libvkd3d-utils.pc.in
noinst_PROGRAMS = vkd3d-compiler noinst_PROGRAMS = vkd3d-compiler
vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la vkd3d_compiler_LDADD = libvkd3d-shader.la
LDADD = libvkd3d.la libvkd3d-utils.la LDADD = libvkd3d.la libvkd3d-utils.la
check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
@ -170,6 +175,14 @@ libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in
-e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \
$< > $@ $< > $@
libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in
$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \
-e 's![@]includedir[@]!$(includedir)!g' \
-e 's![@]libdir[@]!$(libdir)!g' \
-e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \
$< > $@
libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in
$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \

0
include/private/vkd3d_shader.h → include/vkd3d_shader.h
View File

10
libs/vkd3d-shader/libvkd3d-shader.pc.in Normal file
View File

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: vkd3d-shader
Description: The vkd3d Shader Translation Library
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}/vkd3d
Libs: -L${libdir} -lvkd3d-shader