Module: Mesa Branch: master Commit: 231273d588a84436a96cc9c75ecf1858ca15c30c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=231273d588a84436a96cc9c75ecf1858ca15c30c
Author: Eric Engestrom <[email protected]> Date: Tue Mar 5 16:55:02 2019 +0000 vulkan: drop unused include directories Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360> --- src/vulkan/overlay-layer/meson.build | 2 +- src/vulkan/util/meson.build | 2 +- src/vulkan/wsi/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 99a823a58c8..08eaac4163a 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -42,7 +42,7 @@ vklayer_mesa_overlay = shared_library( c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args], cpp_args : [cpp_vis_args, vulkan_wsi_args], dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src], link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']), install : true ) diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build index 77e0810bc05..0798913fe86 100644 --- a/src/vulkan/util/meson.build +++ b/src/vulkan/util/meson.build @@ -40,7 +40,7 @@ vk_enum_to_str = custom_target( libvulkan_util = static_library( 'vulkan_util', [files_vulkan_util, vk_enum_to_str], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src, inc_gallium], dependencies : vulkan_wsi_deps, c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index d243a673d7a..af3f9c5ced2 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -41,7 +41,7 @@ endif libvulkan_wsi = static_library( 'vulkan_wsi', files_vulkan_wsi, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories : [inc_include, inc_src], dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig], c_args : [c_vis_args, vulkan_wsi_args], build_by_default : false, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
