X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fmeson.build;h=c3bf5536521c50b1dc21cc01a99432e604c4c603;hb=b778e7bd6c1d82ce739d7e278de00ee600532cd5;hp=0f8f3c12966d628c0a49103529e8f21ad446ef83;hpb=2ee1c86d71bee5ddca2c8795b4d343e31d28df99;p=mesa.git

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 0f8f3c12966..c3bf5536521 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -19,13 +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',
@@ -47,9 +44,10 @@ 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],
-  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_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
+  c_args : [c_msvc_compat_args, no_override_init_args],
+  cpp_args : [cpp_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
   dependencies : [dep_valgrind],
   build_by_default : false,
 )
@@ -63,10 +61,10 @@ subdir('nir')
 spirv2nir = executable(
   'spirv2nir',
   files('spirv/spirv2nir.c'),
-  dependencies : [dep_m, dep_thread, idep_nir],
-  include_directories : [inc_common, inc_nir, include_directories('spirv')],
-  link_with : libmesa_util,
-  c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
+  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_msvc_compat_args, no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : with_tools.contains('nir'),
   install : with_tools.contains('nir'),
 )