diff options
| author | Dylan Baker <[email protected]> | 2018-01-17 16:08:51 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-01-18 13:31:47 -0800 |
| commit | 26bde1e354041558aae7b2ab004531055b4562b6 (patch) | |
| tree | 4723a710b558b2d61fbcabeecb70570e2a22d364 /src/gallium/targets | |
| parent | 3bccb5dba9415f98f7a3dbb7c43a5eace64b4ec6 (diff) | |
meson: ensure that xmlpool_options.h is generated for targets that need it
Currently a couple of gallium targets race with xmlpool_options.h being
generated, don't do that.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/d3dadapter9/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/meson.build | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index 27a87972215..61bb5649ae5 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -47,7 +47,7 @@ endif libgallium_nine = shared_library( 'd3dadapter9', - files('description.c', 'getproc.c', 'drm.c'), + [files('description.c', 'getproc.c', 'drm.c'), xmlpool_options_h], include_directories : [ inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util, inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys, diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build index 6141d4374fe..25b26a34cac 100644 --- a/src/gallium/targets/pipe-loader/meson.build +++ b/src/gallium/targets/pipe-loader/meson.build @@ -47,21 +47,21 @@ endif pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe') pipe_loaders = [ - [with_gallium_i915, 'i915', driver_i915, []], - [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]], - [with_gallium_freedreno, 'msm', driver_freedreno, []], - [with_gallium_svga, 'vmwgfx', driver_svga, []], - [with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null]], + [with_gallium_i915, 'i915', driver_i915, [], []], + [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_freedreno, 'msm', driver_freedreno, [], []], + [with_gallium_svga, 'vmwgfx', driver_svga, [], []], + [with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null], []], ] foreach x : pipe_loaders if x[0] shared_library( 'pipe_@0@'.format(x[1]), - 'pipe_@[email protected]'.format(x[1]), + ['pipe_@[email protected]'.format(x[1]), x[4]], c_args : [pipe_loader_comp_args, c_vis_args], cpp_args : [pipe_loader_comp_args, cpp_vis_args], link_args : pipe_loader_link_args, |