util: Include bitscan.h directly

[mesa.git] / src / compiler / meson.build

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 58d52e4c6cbd94abb947a9de723c254ec8161af6..e955e66f811cd27f7bca199ba913a1e2d6c7aaa1 100644 (file)
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -23,6 +23,8 @@ inc_nir = include_directories('nir')
 inc_glsl = include_directories('glsl')
 
 files_libcompiler = files(
+  'blob.c',
+  'blob.h',
   'builtin_type_macros.h',
   'glsl_types.cpp',
   'glsl_types.h',
@@ -47,6 +49,7 @@ libcompiler = static_library(
   include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common],
   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],
   build_by_default : false,
 )
 
@@ -55,11 +58,12 @@ subdir('nir')
 spirv2nir = executable(
   'spirv2nir',
   [files('spirv/spirv2nir.c'), dummy_cpp],
-  dependencies : [dep_m, dep_thread],
+  dependencies : [dep_m, dep_thread, idep_nir],
   include_directories : [inc_common, inc_nir, include_directories('spirv')],
-  link_with : [libnir, libmesa_util],
+  link_with : libmesa_util,
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  build_by_default : false,
+  build_by_default : with_tools.contains('nir'),
+  install : with_tools.contains('nir'),
 )
 
 subdir('glsl')