summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-07-22 15:25:28 +0100
committerEric Engestrom <[email protected]>2019-08-03 00:08:37 +0000
commit9a07606b84ec124232f3daddb15e169cc395bf91 (patch)
tree4714bd7a3dda84f7f6af22bf802dd6f9f067aac1 /src/gallium
parent178811d8f6a2a449069830b38d3feae0d34f962a (diff)
meson: replace last uses of libxmlconfig with idep_xmlconfig
Signed-off-by: Eric Engestrom <[email protected]> Acked-by: Eric Anholt <[email protected]> Tested-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/pipe-loader/meson.build8
-rw-r--r--src/gallium/targets/pipe-loader/meson.build2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
index c0b9a53cf65..0e4b1ded5c5 100644
--- a/src/gallium/auxiliary/pipe-loader/meson.build
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -46,8 +46,8 @@ libpipe_loader_static = static_library(
inc_gallium_winsys,
],
c_args : [c_vis_args, libpipe_loader_defines, '-DGALLIUM_STATIC_TARGETS=1'],
- link_with : [libloader, libxmlconfig],
- dependencies : [dep_libdrm],
+ link_with : libloader,
+ dependencies : [dep_libdrm, idep_xmlconfig],
build_by_default : false,
)
@@ -64,7 +64,7 @@ libpipe_loader_dynamic = static_library(
join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe')
)
],
- link_with : [libloader, libxmlconfig],
- dependencies : [dep_libdrm],
+ link_with : libloader,
+ dependencies : [dep_libdrm, idep_xmlconfig],
build_by_default : false,
)
diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index 045eb4174a7..614cad6cecd 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -52,7 +52,7 @@ pipe_loaders = [
[with_gallium_nouveau, 'nouveau', driver_nouveau, [], []],
[with_gallium_r300, 'r300', driver_r300, [], []],
[with_gallium_r600, 'r600', driver_r600, [], []],
- [with_gallium_radeonsi, 'radeonsi', driver_radeonsi, [libxmlconfig], [xmlpool_options_h]],
+ [with_gallium_radeonsi, 'radeonsi', [driver_radeonsi, idep_xmlconfig], [], []],
[with_gallium_freedreno, 'msm', driver_freedreno, [], []],
[with_gallium_svga, 'vmwgfx', driver_svga, [], []],
[with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null], []],