diff options
| author | Dylan Baker <[email protected]> | 2017-11-13 11:14:47 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-11-13 13:43:15 -0800 |
| commit | 49fa0747268af6aa22c89c5eacffe36bf93084d0 (patch) | |
| tree | 5cdfb770f8346edbc25253d9203f9590ed2e1928 | |
| parent | 2bfd34c518134dd656f4f23f3c6c8acb1eeda507 (diff) | |
meson: Don't build intel shared components by default
It's a neat idea, and still useful in some cases, but the intel common
code is used by i965 and anvil only, this is a little clearer.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/intel/blorp/meson.build | 1 | ||||
| -rw-r--r-- | src/intel/common/meson.build | 1 | ||||
| -rw-r--r-- | src/intel/isl/meson.build | 3 | ||||
| -rw-r--r-- | src/meson.build | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index 9241535fd20..febdea97f3c 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -33,5 +33,4 @@ libblorp = static_library( [files_libblorp, nir_opcodes_h], include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], - build_by_default : false, ) diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index db7d74a26d2..cbcf6647531 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -41,5 +41,4 @@ libintel_common = static_library( include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], dependencies : [dep_expat, dep_libdrm], - build_by_default : false, ) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 54024b4d11b..47fd8d97c32 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -60,7 +60,6 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files], include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args, '-DGEN_VERSIONx10=@0@'.format(_gen)], - build_by_default : false, ) isl_gen_libs += _lib endforeach @@ -88,7 +87,6 @@ libisl = static_library( include_directories : [inc_common, inc_intel, inc_drm_uapi], link_with : isl_gen_libs, c_args : [c_vis_args, no_override_init_args], - build_by_default : false, ) if with_tests @@ -98,7 +96,6 @@ if with_tests dependencies : dep_m, include_directories : [inc_common, inc_intel], link_with : [libisl, libintel_common], - build_by_default : false, ) test('isl_surf_get_image_offset', isl_surf_get_image_offset_test) diff --git a/src/meson.build b/src/meson.build index 53c8269a99e..c3b1ff00d00 100644 --- a/src/meson.build +++ b/src/meson.build @@ -55,7 +55,9 @@ subdir('amd') if with_gallium_vc4 subdir('broadcom') endif -subdir('intel') +if with_dri_i965 or with_intel_vk + subdir('intel') +endif subdir('mesa') subdir('loader') subdir('glx') |