From 2fce0a768592a11c949baad52ebeb45079b3966d Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Wed, 11 Jul 2018 17:24:30 +0200 Subject: [PATCH] [build] Extract version number from git if available Logs the version number and game executable name as well. --- meson.build | 6 +++++- src/dxvk/dxvk_instance.cpp | 5 +++++ src/dxvk/meson.build | 2 +- version.h.in | 3 +++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 version.h.in diff --git a/meson.build b/meson.build index 81f1543b..f0a01e7a 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('dxvk', ['c', 'cpp']) +project('dxvk', ['c', 'cpp'], version : 'v0.61') cpu_family = target_machine.cpu_family() @@ -35,6 +35,10 @@ glsl_generator = generator(glsl_compiler, output : [ '@BASENAME@.h' ], arguments : [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ]) +dxvk_version = vcs_tag(['git', 'describe'], + input: 'version.h.in', + output: 'version.h') + subdir('src') enable_tests = get_option('enable_tests') diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp index 4b3e7532..9b10b9a2 100644 --- a/src/dxvk/dxvk_instance.cpp +++ b/src/dxvk/dxvk_instance.cpp @@ -1,3 +1,5 @@ +#include + #include "dxvk_instance.h" #include "dxvk_openvr.h" @@ -6,6 +8,9 @@ namespace dxvk { DxvkInstance::DxvkInstance() { + Logger::info(str::format("Game: ", env::getExeName())); + Logger::info(str::format("DXVK: ", DXVK_VERSION)); + g_vrInstance.initInstanceExtensions(); m_vkl = new vk::LibraryFn(); diff --git a/src/dxvk/meson.build b/src/dxvk/meson.build index 0c435327..1892febc 100644 --- a/src/dxvk/meson.build +++ b/src/dxvk/meson.build @@ -92,7 +92,7 @@ dxvk_src = files([ thread_dep = dependency('threads') -dxvk_lib = static_library('dxvk', dxvk_src, glsl_generator.process(dxvk_shaders), +dxvk_lib = static_library('dxvk', dxvk_src, glsl_generator.process(dxvk_shaders), dxvk_version, link_with : [ util_lib, spirv_lib ], dependencies : [ thread_dep, lib_vulkan ], include_directories : [ dxvk_include_path ], diff --git a/version.h.in b/version.h.in new file mode 100644 index 00000000..e9cc1c3a --- /dev/null +++ b/version.h.in @@ -0,0 +1,3 @@ +#pragma once + +#define DXVK_VERSION "@VCS_TAG@"