meson: inline inc_common

Let's make it clear what includes are being added everywhere, so that
they can be cleaned up.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>
This commit is contained in:
Eric Engestrom
2019-03-05 16:21:47 +00:00
parent 5a32dda8e6
commit 79af30768d
98 changed files with 199 additions and 158 deletions

View File

@@ -25,7 +25,7 @@ if with_shader_cache
'cache_test',
'cache_test.c',
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common, inc_glsl],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl],
dependencies : [dep_clock, dep_thread],
),
@@ -42,7 +42,7 @@ test(
'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp',
'varyings_test.cpp', ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, inc_glsl],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_standalone, libglsl_util],
dependencies : [dep_clock, dep_thread, idep_gtest],
),
@@ -57,7 +57,7 @@ test(
'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, inc_glsl],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_gtest],
),
@@ -70,7 +70,7 @@ test(
'sampler_types_test',
['sampler_types_test.cpp', ir_expression_operation_h],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, inc_glsl],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_gtest],
),