summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-01-17 10:26:58 -0800
committerDylan Baker <[email protected]>2018-02-15 10:35:51 -0800
commit7023b373ec76a2ea25b1bd0a7501276de9007047 (patch)
treeb975ffd2597cae5a512ad77ec96d2fb90a160e25 /src/gallium/auxiliary
parent424e654cb02182c00d1b76c512a8fe17af281e4b (diff)
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 <[email protected]> Acked-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/meson.build7
1 files changed, 6 insertions, 1 deletions
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,
)