diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-01-17 10:26:58 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-02-15 10:35:51 -0800 |
| commit | 7023b373ec76a2ea25b1bd0a7501276de9007047 (patch) | |
| tree | b975ffd2597cae5a512ad77ec96d2fb90a160e25 /src/gallium/auxiliary | |
| parent | 424e654cb02182c00d1b76c512a8fe17af281e4b (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 <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 6f1542d7ad..5908f9c430 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, ) |