wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Trace build version.

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-06-27 15:19:25 +02:00 committed by Alexandre Julliard
parent 89a2dc46dd
commit 404e988ecd
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -94,7 +94,8 @@ libvkd3d_la_SOURCES = \
libs/vkd3d/vkd3d.map \ libs/vkd3d/vkd3d.map \
libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_main.c \
libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_private.h \
libs/vkd3d/vulkan_procs.h libs/vkd3d/vulkan_procs.h \
libs/vkd3d_version.c
libvkd3d_la_LDFLAGS = -version-info 1:0:0 libvkd3d_la_LDFLAGS = -version-info 1:0:0
libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
@ -173,6 +174,14 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in
-e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \
$< > $@ $< > $@
libs/vkd3d_version.c: dummy-vkd3d-version
version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
.SILENT: libs/vkd3d_version.c
CLEANFILES += libs/vkd3d_version.c
.PHONY: dummy-vkd3d-version
dummy-vkd3d-version:
## Cross-compile tests ## Cross-compile tests
cross_implibs = crosslibs/d3d12 cross_implibs = crosslibs/d3d12
CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include

1
libs/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
vkd3d_version.c

2
libs/vkd3d/device.c
View File

@ -284,6 +284,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
VkResult vr; VkResult vr;
HRESULT hr; HRESULT hr;
TRACE("Build: %s.\n", vkd3d_build);
if (!create_info->pfn_signal_event) if (!create_info->pfn_signal_event)
{ {
ERR("Invalid signal event function pointer.\n"); ERR("Invalid signal event function pointer.\n");

2
libs/vkd3d/vkd3d_private.h
View File

@ -794,4 +794,6 @@ HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs,
HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs,
const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN;
extern const char vkd3d_build[];
#endif /* __VKD3D_PRIVATE_H */ #endif /* __VKD3D_PRIVATE_H */