From 7023b373ec76a2ea25b1bd0a7501276de9007047 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Jan 2018 10:26:58 -0800 Subject: meson: link dri3 xcb libs into vlwinsys instead of into each target This makes the dependencies easier to manage, since each media target doesn't need to worry about linking to half a dozen libraries. Fixes: b1b65397d0c4978e3 ("meson: Build gallium auxiliary") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/auxiliary/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 6f1542d7ade..5908f9c4309 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -452,10 +452,15 @@ files_libgalliumvl = files( 'vl/vl_zscan.h', ) +vlwinsys_deps = [] files_libgalliumvlwinsys = files('vl/vl_winsys.h') if with_dri2 files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c') if with_dri3 + vlwinsys_deps += [ + dep_xcb_sync, dep_xcb_present, dep_xshmfence, dep_xcb_xfixes, + dep_xcb_dri3, + ] files_libgalliumvlwinsys += files('vl/vl_winsys_dri3.c') endif endif @@ -526,6 +531,6 @@ libgalliumvlwinsys = static_library( 'galliumvlwinsys', files_libgalliumvlwinsys, include_directories : [inc_gallium, inc_include, inc_loader, inc_src], - dependencies : [dep_libdrm], + dependencies : [dep_libdrm, vlwinsys_deps], build_by_default : false, ) -- cgit v1.2.3