From 04113bdea062729ea9df502fc90223b0861a2be6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 31 Mar 2023 14:21:29 +0100 Subject: [PATCH] build: Use a different SONAME for the glfw WSI Selecting the GLFW WSI gives DXVK an incompatible ABI: for example, CreateDevice takes a `SDL_Window *` parameter in the default SDL WSI, but takes a `GLFWwindow *` instead in the GLFW WSI. This means it should get a different name, so that binaries expecting one WSI don't unexpectedly load the other. Resolves: https://github.com/doitsujin/dxvk/issues/3321 Signed-off-by: Simon McVittie --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 2a576912068..d500843f353 100644 --- a/meson.build +++ b/meson.build @@ -121,8 +121,12 @@ else lib_glfw = cpp.find_library('glfw') compiler_args += ['-DDXVK_WSI_GLFW'] endif - - dxvk_name_prefix = 'libdxvk_' + + if dxvk_wsi == 'sdl2' + dxvk_name_prefix = 'libdxvk_' + else + dxvk_name_prefix = 'libdxvk_@0@_'.format(dxvk_wsi) + endif link_args += [ '-static-libgcc',