Skip to content

Commit

Permalink
Use .dll.so suffix with winelib builds
Browse files Browse the repository at this point in the history
Meson doesn't yet understand the whole executable wrapper thing, so just
produce the raw .dll.so which is all we need anyway.
  • Loading branch information
cwabbott0 committed Jul 2, 2021
1 parent 0351b45 commit 9e0bcae
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
6 changes: 6 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ endif

def_spec_ext = '.def'

if dxvk_is_winelib
library_ext = 'dll.so'
else
library_ext = []
endif

glsl_compiler = find_program('glslangValidator')
glsl_args = [ '-V', '--vn', '@BASENAME@', '@INPUT@', '-o', '@OUTPUT@' ]
if run_command(glsl_compiler, [ '--quiet', '--version' ]).returncode() == 0
Expand Down
9 changes: 6 additions & 3 deletions src/d3d10/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'd3d10core'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

d3d10_core_dep = declare_dependency(
link_with : [ d3d10_core_dll ])
Expand All @@ -31,15 +32,17 @@ d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src, d3d10_res,
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'd3d10'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

d3d10_1_dll = shared_library('d3d10_1'+dll_ext, d3d10_main_src, d3d10_1_res,
name_prefix : '',
dependencies : [ d3d10_deps ],
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'd3d10_1'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

d3d10_dep = declare_dependency(
link_with : [ d3d10_dll, d3d10_1_dll, d3d10_core_dll ],
Expand Down
3 changes: 2 additions & 1 deletion src/d3d11/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ d3d11_dll = shared_library('d3d11'+dll_ext, dxgi_common_src + d3d11_src + d3d10_
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'd3d11'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

d3d11_dep = declare_dependency(
link_with : [ d3d11_dll ],
Expand Down
3 changes: 2 additions & 1 deletion src/d3d9/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ d3d9_dll = shared_library('d3d9'+dll_ext, d3d9_src, glsl_generator.process(d3d9_
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'd3d9'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

d3d9_dep = declare_dependency(
link_with : [ d3d9_dll ],
Expand Down
3 changes: 2 additions & 1 deletion src/dxgi/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, dxgi_res,
include_directories : dxvk_include_path,
install : true,
vs_module_defs : 'dxgi'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std])
override_options : ['cpp_std='+dxvk_cpp_std],
name_suffix : library_ext)

dxgi_dep = declare_dependency(
link_with : [ dxgi_dll ],
Expand Down

0 comments on commit 9e0bcae

Please sign in to comment.