OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: inline inc_common

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/meson.build
View File

@@ -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'),