From cb7c9b2a9352cc73a2d3becc0427c53c8baf153a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 10 May 2019 18:55:54 +0100 Subject: vulkan: fix build dependency issue with generated files On machines with many cores, you can run into that issue : ../mesa-9999/src/vulkan/overlay-layer/overlay.cpp:42:10: fatal error: vk_enum_to_str.h: No such file or directory v2: Move declare_dependency around (Eric) Signed-off-by: Lionel Landwerlin Reported-by: Jan Ziak Cc: Reviewed-by: Eric Engestrom --- src/amd/vulkan/meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/amd') diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 532267343d1..3a696e46e56 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -133,17 +133,16 @@ libvulkan_radeon = shared_library( 'vulkan_radeon', [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, xmlpool_options_h], include_directories : [ - inc_common, inc_amd, inc_amd_common, inc_compiler, inc_util, inc_vulkan_util, - inc_vulkan_wsi, + inc_common, inc_amd, inc_amd_common, inc_compiler, inc_util, inc_vulkan_wsi, ], link_with : [ - libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi, + libamd_common, libamdgpu_addrlib, libvulkan_wsi, libmesa_util, libxmlconfig ], dependencies : [ dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_valgrind, radv_deps, - idep_nir, + idep_nir, idep_vulkan_util, ], c_args : [c_vis_args, no_override_init_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags], -- cgit v1.2.3