diff options
| author | Eric Engestrom <[email protected]> | 2019-07-22 14:50:15 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-08-03 00:08:37 +0000 |
| commit | d2d85b950d78c553b2694cda9ef0cc7bf9a0f737 (patch) | |
| tree | afdd28e30b66064b8b540a6e9d6d0ecbe27a6678 /src/compiler/glsl | |
| parent | 8ddb38209d51c53d6e5792b04b97814dfce9bce6 (diff) | |
meson: replace libmesa_util with idep_mesautil
This automates the include_directories and dependencies tracking so that
all users of libmesa_util don't need to add them manually.
Next commit will remove the ones that were only added for that reason.
Signed-off-by: Eric Engestrom <[email protected]>
Acked-by: Eric Anholt <[email protected]>
Tested-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/glcpp/meson.build | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 677baf1df10..5a665444f06 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -38,7 +38,7 @@ glcpp_lex = custom_target( libglcpp = static_library( 'glcpp', [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], - link_with : libmesa_util, + dependencies : idep_mesautil, include_directories : [inc_common], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index fe1dc8ffe6a..ce6744eec66 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -240,8 +240,8 @@ libglsl_standalone = static_library( 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], - link_with : [libglsl, libglsl_util, libmesa_util], - dependencies : [dep_thread], + link_with : [libglsl, libglsl_util], + dependencies : [dep_thread, idep_mesautil], build_by_default : false, ) |