diff options
| author | Dylan Baker <[email protected]> | 2017-09-29 17:53:01 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-10-16 16:32:43 -0700 |
| commit | 50c28dfa813e82492dc1e6fcd7b2ec49d501cefc (patch) | |
| tree | 4f58e2dd9a986cabf564c9cb2f3c97d0c0df114e /src | |
| parent | b1b65397d0c4978e36a84c0a1c98a4bd6cb9588e (diff) | |
meson: split and simplify dependencies
Rather than group dependencies in complex groups, use a flatter
structure with split dependencies to avoid checking for the same
dependencies twice.
v2: - Fix building vulkan drivers without gallium or dri drivers
v3: - Drop TODO comment that is done
- Fix typo in commit message
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/loader/meson.build | 5 | ||||
| -rw-r--r-- | src/vulkan/wsi/meson.build | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/loader/meson.build b/src/loader/meson.build index 425620372aa..2f97cdc83bf 100644 --- a/src/loader/meson.build +++ b/src/loader/meson.build @@ -26,7 +26,10 @@ if with_platform_x11 and with_dri3 ['loader_dri3_helper.c', 'loader_dri3_helper.h'], c_args : c_vis_args, include_directories : inc_include, - dependencies : [dep_xcb_dri3, dep_libdrm], + dependencies : [ + dep_xshmfence, dep_xcb_present, dep_xcb_dri3, dep_xcb_sync, dep_x11_xcb, + dep_xext, dep_xdamage, dep_xcb_glx, dep_libdrm, + ], build_by_default : false, ) else diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index 517f50f2158..c42af8e4cde 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -41,7 +41,15 @@ files_vulkan_wsi = files( ) if with_platform_x11 vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] - vulkan_wsi_deps += dep_xcb_dri3 + vulkan_wsi_deps += [ + dep_xcb, + dep_x11_xcb, + dep_xcb_dri2, + dep_xcb_dri3, + dep_xcb_present, + dep_xcb_sync, + dep_xshmfence, + ] files_vulkan_wsi += files( 'wsi_common_x11.c', 'wsi_common_x11.h', |