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 <dylan.c.baker@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
3bccb5dba9
commit
26bde1e354
|
@ -37,7 +37,7 @@ endif
|
||||||
|
|
||||||
libpipe_loader_static = static_library(
|
libpipe_loader_static = static_library(
|
||||||
'pipe_loader_static',
|
'pipe_loader_static',
|
||||||
files_pipe_loader,
|
[files_pipe_loader, xmlpool_options_h],
|
||||||
include_directories : [
|
include_directories : [
|
||||||
inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
|
inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
|
||||||
inc_gallium_winsys,
|
inc_gallium_winsys,
|
||||||
|
@ -53,7 +53,7 @@ libpipe_loader_static = static_library(
|
||||||
|
|
||||||
libpipe_loader_dynamic = static_library(
|
libpipe_loader_dynamic = static_library(
|
||||||
'pipe_loader_dynamic',
|
'pipe_loader_dynamic',
|
||||||
files_pipe_loader,
|
[files_pipe_loader, xmlpool_options_h],
|
||||||
include_directories : [
|
include_directories : [
|
||||||
inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
|
inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
|
||||||
inc_gallium_winsys,
|
inc_gallium_winsys,
|
||||||
|
|
|
@ -47,7 +47,7 @@ endif
|
||||||
|
|
||||||
libgallium_nine = shared_library(
|
libgallium_nine = shared_library(
|
||||||
'd3dadapter9',
|
'd3dadapter9',
|
||||||
files('description.c', 'getproc.c', 'drm.c'),
|
[files('description.c', 'getproc.c', 'drm.c'), xmlpool_options_h],
|
||||||
include_directories : [
|
include_directories : [
|
||||||
inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
|
inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
|
||||||
inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
|
inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
|
||||||
|
|
|
@ -47,21 +47,21 @@ endif
|
||||||
pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe')
|
pipe_loader_install_dir = join_paths(get_option('libdir'), 'gallium-pipe')
|
||||||
|
|
||||||
pipe_loaders = [
|
pipe_loaders = [
|
||||||
[with_gallium_i915, 'i915', driver_i915, []],
|
[with_gallium_i915, 'i915', driver_i915, [], []],
|
||||||
[with_gallium_nouveau, 'nouveau', driver_nouveau, []],
|
[with_gallium_nouveau, 'nouveau', driver_nouveau, [], []],
|
||||||
[with_gallium_r300, 'r300', driver_r300, []],
|
[with_gallium_r300, 'r300', driver_r300, [], []],
|
||||||
[with_gallium_r600, 'r600', driver_r600, []],
|
[with_gallium_r600, 'r600', driver_r600, [], []],
|
||||||
[with_gallium_radeonsi, 'radeonsi', driver_radeonsi, [libxmlconfig]],
|
[with_gallium_radeonsi, 'radeonsi', driver_radeonsi, [libxmlconfig], [xmlpool_options_h]],
|
||||||
[with_gallium_freedreno, 'msm', driver_freedreno, []],
|
[with_gallium_freedreno, 'msm', driver_freedreno, [], []],
|
||||||
[with_gallium_svga, 'vmwgfx', driver_svga, []],
|
[with_gallium_svga, 'vmwgfx', driver_svga, [], []],
|
||||||
[with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null]],
|
[with_gallium_softpipe, 'swrast', [driver_swrast, driver_swr], [libwsw, libws_null], []],
|
||||||
]
|
]
|
||||||
|
|
||||||
foreach x : pipe_loaders
|
foreach x : pipe_loaders
|
||||||
if x[0]
|
if x[0]
|
||||||
shared_library(
|
shared_library(
|
||||||
'pipe_@0@'.format(x[1]),
|
'pipe_@0@'.format(x[1]),
|
||||||
'pipe_@0@.c'.format(x[1]),
|
['pipe_@0@.c'.format(x[1]), x[4]],
|
||||||
c_args : [pipe_loader_comp_args, c_vis_args],
|
c_args : [pipe_loader_comp_args, c_vis_args],
|
||||||
cpp_args : [pipe_loader_comp_args, cpp_vis_args],
|
cpp_args : [pipe_loader_comp_args, cpp_vis_args],
|
||||||
link_args : pipe_loader_link_args,
|
link_args : pipe_loader_link_args,
|
||||||
|
|
Loading…
Reference in New Issue