util: Log build target name

jp7677 · Nov 27, 2024 · a49e4b8 · a49e4b8
1 parent 791d20e
commit a49e4b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -26,7 +26,9 @@ nvapi_src = files([
   'nvapi_interface.cpp',
 ])
 
-nvapi_dll = shared_library('nvapi'+target_suffix, [ nvapi_src, dxvk_nvapi_version ],
+target_name = 'nvapi'+target_suffix
+nvapi_dll = shared_library(target_name, [ nvapi_src, dxvk_nvapi_version ],
+  cpp_args            : '-DDXVK_NVAPI_TARGET_NAME="'+target_name+'"',
   name_prefix         : '',
   dependencies        : [ lib_dxgi, lib_d3d11, lib_version ],
   include_directories : [ nvapi_headers, vk_headers ],
@@ -47,7 +49,9 @@ nvofapi_src = files([
 
 # Only build 64-bit versions of nvofapi
 if dxvk_cpu_family == 'x86_64'
-  nvofapi_dll = shared_library('nvofapi'+target_suffix, [ nvofapi_src, dxvk_nvapi_version ],
+  target_name = 'nvofapi'+target_suffix
+  nvofapi_dll = shared_library(target_name, [ nvofapi_src, dxvk_nvapi_version ],
+    cpp_args            : '-DDXVK_NVAPI_TARGET_NAME="'+target_name+'"',
     name_prefix         : '',
     dependencies        : [ lib_version ],
     include_directories : [ nvapi_headers, vk_headers ],

diff --git a/src/util/util_log.cpp b/src/util/util_log.cpp
@@ -82,7 +82,7 @@ namespace dxvk::log {
             std::setfill('0'), std::setw(4), std::hex, ::GetCurrentProcessId(), ":",
             std::setfill('0'), std::setw(4), std::hex, ::GetCurrentThreadId(), ":",
             level, ":",
-            "dxvk-nvapi:",
+            DXVK_NVAPI_TARGET_NAME, ":",
             message);
 
         print(logMessage);

diff --git a/tests/meson.build b/tests/meson.build
@@ -42,7 +42,9 @@ nvapi_tests_src = files([
   'util.cpp',
 ])
 
-nvapi_exe = executable('nvapi'+target_suffix+'-tests', [ nvapi_src, catch2_src, nvapi_tests_src, dxvk_nvapi_version ],
+target_name = 'nvapi'+target_suffix+'-tests'
+nvapi_exe = executable(target_name, [ nvapi_src, catch2_src, nvapi_tests_src, dxvk_nvapi_version ],
+  cpp_args            : '-DDXVK_NVAPI_TARGET_NAME="'+target_name+'"',
   dependencies        : [ lib_dxgi, lib_d3d11, lib_version ],
   include_directories : [ nvapi_headers, vk_headers ],
   install             : true)