From ff604d5a53428af4bf49e4f87b619d989a62051f Mon Sep 17 00:00:00 2001 From: pchome Date: Tue, 28 Aug 2018 00:19:18 +0300 Subject: [PATCH] [d3d10] Fix d3d11 dependecy for winelib build --- src/d3d10/meson.build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/d3d10/meson.build b/src/d3d10/meson.build index 4218bee03..d6be9f41f 100644 --- a/src/d3d10/meson.build +++ b/src/d3d10/meson.build @@ -3,10 +3,13 @@ d3d10_main_src = [ 'd3d10_reflection.cpp', ] +d3d10_deps = [ lib_d3dcompiler_43, lib_dxgi ] +d3d10_deps += meson.get_cross_property('winelib', false) ? lib_d3d11 : d3d11_dep + d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_main_src, name_prefix : '', link_with : [ util_lib ], - dependencies : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ], + dependencies : [ d3d10_deps, dxbc_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, objects : not dxvk_msvc ? 'd3d10core'+def_spec_ext : [], @@ -16,7 +19,7 @@ d3d10_core_dll = shared_library('d3d10core'+dll_ext, d3d10_main_src, d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src, name_prefix : '', link_with : [ util_lib ], - dependencies : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ], + dependencies : [ d3d10_deps, dxbc_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, objects : not dxvk_msvc ? 'd3d10'+def_spec_ext : [], @@ -26,7 +29,7 @@ d3d10_dll = shared_library('d3d10'+dll_ext, d3d10_main_src, d3d10_1_dll = shared_library('d3d10_1'+dll_ext, d3d10_main_src, name_prefix : '', link_with : [ util_lib ], - dependencies : [ lib_d3dcompiler_43, lib_dxgi, d3d11_dep, dxbc_dep, dxvk_dep ], + dependencies : [ d3d10_deps, dxbc_dep, dxvk_dep ], include_directories : dxvk_include_path, install : true, objects : not dxvk_msvc ? 'd3d10_1'+def_spec_ext : [],