rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-18 11:52:12 +01:00
Code Issues Projects Releases Wiki Activity

Don't add def file as an object

Browse Source 
This is unnecessary even on mingw, and leads to duplicating the .def
file on the linking command line which winegcc complains about.
This commit is contained in:
Connor Abbott 2021-07-02 14:33:31 +02:00 committed by Philip Rebohle
parent 2988875e93
commit aae0e57a46
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
4 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/d3d10/meson.build
View File

@ -17,7 +17,6 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_
dependencies : [ d3d11_dep ], dependencies : [ d3d11_dep ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
objects : not dxvk_is_msvc ? 'd3d10core'+def_spec_ext : [],
vs_module_defs : 'd3d10core'+def_spec_ext, vs_module_defs : 'd3d10core'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])
@ -31,7 +30,6 @@ d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src, d3d10_res,
dependencies : [ d3d10_deps ], dependencies : [ d3d10_deps ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
objects : not dxvk_is_msvc ? 'd3d10'+def_spec_ext : [],
vs_module_defs : 'd3d10'+def_spec_ext, vs_module_defs : 'd3d10'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])
@ -40,7 +38,6 @@ d3d10_1_dll = shared_library('d3d10_1'+dll_ext, d3d10_main_src, d3d10_1_res,
dependencies : [ d3d10_deps ], dependencies : [ d3d10_deps ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
objects : not dxvk_is_msvc ? 'd3d10_1'+def_spec_ext : [],
vs_module_defs : 'd3d10_1'+def_spec_ext, vs_module_defs : 'd3d10_1'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])

1
src/d3d11/meson.build
View File

@ -70,7 +70,6 @@ d3d11_dll = shared_library('d3d11'+dll_ext, dxgi_common_src + d3d11_src + d3d10_
dependencies : [ lib_dxgi, dxbc_dep, dxvk_dep ], dependencies : [ lib_dxgi, dxbc_dep, dxvk_dep ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
objects : not dxvk_is_msvc ? 'd3d11'+def_spec_ext : [],
vs_module_defs : 'd3d11'+def_spec_ext, vs_module_defs : 'd3d11'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])

1
src/d3d9/meson.build
View File

@ -46,7 +46,6 @@ d3d9_dll = shared_library('d3d9'+dll_ext, d3d9_src, glsl_generator.process(d3d9_
dependencies : [ dxso_dep, dxvk_dep ], dependencies : [ dxso_dep, dxvk_dep ],
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
objects : not dxvk_is_msvc ? 'd3d9'+def_spec_ext : [],
vs_module_defs : 'd3d9'+def_spec_ext, vs_module_defs : 'd3d9'+def_spec_ext,
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])

1
src/dxgi/meson.build
View File

@ -18,7 +18,6 @@ dxgi_dll = shared_library('dxgi'+dll_ext, dxgi_src, dxgi_res,
include_directories : dxvk_include_path, include_directories : dxvk_include_path,
install : true, install : true,
vs_module_defs : 'dxgi'+def_spec_ext, vs_module_defs : 'dxgi'+def_spec_ext,
objects : not dxvk_is_msvc ? 'dxgi'+def_spec_ext : [],
override_options : ['cpp_std='+dxvk_cpp_std]) override_options : ['cpp_std='+dxvk_cpp_std])
dxgi_dep = declare_dependency( dxgi_dep = declare_dependency(