From 25798f6fe15c55b19e050ab484c122fc29d4a30d Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Wed, 5 Oct 2022 21:04:59 +0100 Subject: [PATCH] [build] Set name_prefix to `libdxvk_` for native builds Less rude and nicer than just d3d9.so. Matches old DXVK native behaviour too. --- meson.build | 2 ++ src/d3d10/meson.build | 2 +- src/d3d11/meson.build | 2 +- src/d3d9/meson.build | 2 +- src/dxgi/meson.build | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index ba5f88bb5..0ae1a4c92 100644 --- a/meson.build +++ b/meson.build @@ -97,6 +97,7 @@ if platform == 'windows' endif dxvk_wsi = 'win32' + dxvk_name_prefix = '' compiler_args += ['-DDXVK_WSI_WIN32'] else lib_sdl2 = cpp.find_library('SDL2') @@ -111,6 +112,7 @@ else ] dxvk_wsi = 'sdl2' + dxvk_name_prefix = 'libdxvk_' compiler_args += ['-DDXVK_WSI_SDL2'] endif diff --git a/src/d3d10/meson.build b/src/d3d10/meson.build index 20324939d..1ef0167f4 100644 --- a/src/d3d10/meson.build +++ b/src/d3d10/meson.build @@ -5,7 +5,7 @@ d3d10_core_src = [ ] d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_res, - name_prefix : '', + name_prefix : dxvk_name_prefix, dependencies : [ d3d11_dep ], include_directories : dxvk_include_path, install : true, diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 7727387d6..26d655ade 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -69,7 +69,7 @@ d3d11_shaders = files([ d3d11_dll = shared_library('d3d11'+dll_ext, dxgi_common_src + d3d11_src + d3d10_src, glsl_generator.process(d3d11_shaders), d3d11_res, - name_prefix : '', + name_prefix : dxvk_name_prefix, dependencies : [ dxgi_dep, dxbc_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, diff --git a/src/d3d9/meson.build b/src/d3d9/meson.build index bb5f3f387..9bb8eb1db 100644 --- a/src/d3d9/meson.build +++ b/src/d3d9/meson.build @@ -47,7 +47,7 @@ d3d9_src = [ ] d3d9_dll = shared_library('d3d9'+dll_ext, d3d9_src, glsl_generator.process(d3d9_shaders), d3d9_res, - name_prefix : '', + name_prefix : dxvk_name_prefix, dependencies : [ dxso_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, diff --git a/src/dxgi/meson.build b/src/dxgi/meson.build index daa790f47..d25701f4a 100644 --- a/src/dxgi/meson.build +++ b/src/dxgi/meson.build @@ -13,7 +13,7 @@ dxgi_src = [ ] dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, dxgi_res, - name_prefix : '', + name_prefix : dxvk_name_prefix, dependencies : [ dxvk_dep ], include_directories : dxvk_include_path, install : true,