diff --git a/src/d3d10/meson.build b/src/d3d10/meson.build index 46a10c4bd..8633cd1b5 100644 --- a/src/d3d10/meson.build +++ b/src/d3d10/meson.build @@ -17,7 +17,6 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_core_src, d3d10_core_ dependencies : [ d3d11_dep ], include_directories : dxvk_include_path, install : true, - objects : not dxvk_is_msvc ? 'd3d10core'+def_spec_ext : [], vs_module_defs : 'd3d10core'+def_spec_ext, 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 ], include_directories : dxvk_include_path, install : true, - objects : not dxvk_is_msvc ? 'd3d10'+def_spec_ext : [], vs_module_defs : 'd3d10'+def_spec_ext, 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 ], include_directories : dxvk_include_path, install : true, - objects : not dxvk_is_msvc ? 'd3d10_1'+def_spec_ext : [], vs_module_defs : 'd3d10_1'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build index 995755aa4..a0156c928 100644 --- a/src/d3d11/meson.build +++ b/src/d3d11/meson.build @@ -70,7 +70,6 @@ d3d11_dll = shared_library('d3d11'+dll_ext, dxgi_common_src + d3d11_src + d3d10_ dependencies : [ lib_dxgi, dxbc_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, - objects : not dxvk_is_msvc ? 'd3d11'+def_spec_ext : [], vs_module_defs : 'd3d11'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) diff --git a/src/d3d9/meson.build b/src/d3d9/meson.build index 3f058bb6f..2fef50191 100644 --- a/src/d3d9/meson.build +++ b/src/d3d9/meson.build @@ -46,7 +46,6 @@ d3d9_dll = shared_library('d3d9'+dll_ext, d3d9_src, glsl_generator.process(d3d9_ dependencies : [ dxso_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, - objects : not dxvk_is_msvc ? 'd3d9'+def_spec_ext : [], vs_module_defs : 'd3d9'+def_spec_ext, override_options : ['cpp_std='+dxvk_cpp_std]) diff --git a/src/dxgi/meson.build b/src/dxgi/meson.build index 4c7afd7c9..20d5f3a5d 100644 --- a/src/dxgi/meson.build +++ b/src/dxgi/meson.build @@ -18,7 +18,6 @@ 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, - objects : not dxvk_is_msvc ? 'dxgi'+def_spec_ext : [], override_options : ['cpp_std='+dxvk_cpp_std]) dxgi_dep = declare_dependency(