Skip to content

Commit

Permalink
build: Use a different SONAME for the glfw WSI
Browse files Browse the repository at this point in the history
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: doitsujin#3321
Signed-off-by: Simon McVittie <smcv@collabora.com>
  • Loading branch information
smcv committed Mar 31, 2023
1 parent 3069190 commit 04113bd
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 04113bd

Please sign in to comment.