X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fmeson.build;h=e068a30a6bdd7f9c7e9c050f9cfabb13e2c2cde7;hb=dca3f351e5b70afd1a0088b829f9b45617c2e538;hp=e955e66f811cd27f7bca199ba913a1e2d6c7aaa1;hpb=1f4d2433e73a0a6d4e2a180de407970d983309db;p=mesa.git

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index e955e66f811..e068a30a6bd 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -19,12 +19,10 @@
 # SOFTWARE.
 
 inc_compiler = include_directories('.')
-inc_nir = include_directories('nir')
 inc_glsl = include_directories('glsl')
+inc_spirv = include_directories('spirv')
 
 files_libcompiler = files(
-  'blob.c',
-  'blob.h',
   'builtin_type_macros.h',
   'glsl_types.cpp',
   'glsl_types.h',
@@ -39,28 +37,31 @@ ir_expression_operation_h = custom_target(
   'ir_expression_operation.h',
   input : 'glsl/ir_expression_operation.py',
   output : 'ir_expression_operation.h',
-  command : [prog_python2, '@INPUT@', 'enum'],
+  command : [prog_python, '@INPUT@', 'enum'],
   capture : true,
 )
 
 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],
   build_by_default : false,
 )
 
+subdir('spirv')
+
 subdir('nir')
 
+# This is here because putting it in spirv/meson.build would create a circular
+# dependency with nir/meson.build.
 spirv2nir = executable(
   'spirv2nir',
-  [files('spirv/spirv2nir.c'), dummy_cpp],
-  dependencies : [dep_m, dep_thread, idep_nir],
-  include_directories : [inc_common, inc_nir, include_directories('spirv')],
-  link_with : libmesa_util,
+  files('spirv/spirv2nir.c'),
+  dependencies : [dep_m, idep_nir, idep_mesautil],
+  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'),