diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/glcpp/meson.build | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/meson.build | 8 | ||||
| -rw-r--r-- | src/compiler/glsl/tests/meson.build | 8 | ||||
| -rw-r--r-- | src/compiler/meson.build | 4 | ||||
| -rw-r--r-- | src/compiler/nir/meson.build | 16 |
5 files changed, 21 insertions, 21 deletions
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 81c8d65dca1..c87f0b6c0be 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -49,7 +49,7 @@ libglcpp = static_library( 'glcpp', [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], dependencies : idep_mesautil, - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args], build_by_default : false, @@ -59,7 +59,7 @@ libglcpp_standalone = static_library( 'glcpp_standalone', 'pp_standalone_scaffolding.c', link_with : libglcpp, - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args], build_by_default : false, @@ -69,7 +69,7 @@ glcpp = executable( 'glcpp', 'glcpp.c', dependencies : [dep_m, idep_getopt], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglcpp_standalone, libglsl_util], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args], build_by_default : false, diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index eff98fef109..215c472ebae 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -231,7 +231,7 @@ libglsl = static_library( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], link_with : libglcpp, - include_directories : [inc_common, inc_compiler], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler], dependencies : idep_nir, build_by_default : false, ) @@ -241,7 +241,7 @@ libglsl_standalone = static_library( [files_libglsl_standalone, ir_expression_operation_h], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglsl, libglsl_util, libglcpp_standalone], dependencies : [idep_mesautil, idep_getopt], build_by_default : false, @@ -253,7 +253,7 @@ glsl_compiler = executable( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], dependencies : [dep_clock, dep_thread, idep_getopt], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], link_with : [libglsl_standalone], build_by_default : with_tools.contains('glsl'), install : with_tools.contains('glsl'), @@ -265,7 +265,7 @@ glsl_test = executable( ir_expression_operation_h], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_clock, dep_thread, idep_getopt], link_with : [libglsl, libglsl_standalone, libglsl_util], build_by_default : with_tools.contains('glsl'), diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build index 3526110dbc1..41f8ae615d1 100644 --- a/src/compiler/glsl/tests/meson.build +++ b/src/compiler/glsl/tests/meson.build @@ -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], ), diff --git a/src/compiler/meson.build b/src/compiler/meson.build index 9dfcb3449ef..e068a30a6bd 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -44,7 +44,7 @@ ir_expression_operation_h = custom_target( libcompiler = static_library( 'compiler', [files_libcompiler, ir_expression_operation_h], - include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common], + include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], dependencies : [dep_valgrind], @@ -61,7 +61,7 @@ spirv2nir = executable( 'spirv2nir', files('spirv/spirv2nir.c'), dependencies : [dep_m, idep_nir, idep_mesautil], - include_directories : [inc_common, include_directories('spirv')], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('spirv')], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], build_by_default : with_tools.contains('nir'), install : with_tools.contains('nir'), diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 3e48eb1cf6a..82e2d17d8cb 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -253,7 +253,7 @@ _libnir = static_library( [files_libnir, spirv_info_c, nir_opt_algebraic_c, nir_opcodes_c, nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h, vtn_gather_types_c, nir_intrinsics_c, nir_intrinsics_h], - include_directories : [inc_common, inc_compiler, include_directories('../spirv')], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, include_directories('../spirv')], c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], link_with : libcompiler, build_by_default : false, @@ -280,7 +280,7 @@ if with_tests 'nir_builder_test', files('tests/builder_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -292,7 +292,7 @@ if with_tests 'nir_control_flow_test', files('tests/control_flow_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -304,7 +304,7 @@ if with_tests 'nir_vars_test', files('tests/vars_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -325,7 +325,7 @@ if with_tests 'negative_equal', files('tests/negative_equal_tests.cpp'), c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -337,7 +337,7 @@ if with_tests 'comparison_pre', files('tests/comparison_pre_tests.cpp'), c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -349,7 +349,7 @@ if with_tests 'load_store_vectorizer', files('tests/load_store_vectorizer_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], @@ -362,7 +362,7 @@ if with_tests 'nir_serialize_test', files('tests/serialize_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], - include_directories : [inc_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], |