meson: use gnu_symbol_visibility argument

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

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 9fc8d9d02869e5439c2a797a7fd8cc5d9894b286..bc4eda26a763bcce35afb2b55c67244792e8b69e 100644 (file)
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -47,12 +47,23 @@ endif
 
 libglcpp = static_library(
   'glcpp',
-  [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c',
-                                 'pp_standalone_scaffolding.c')],
+  [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
   dependencies : idep_mesautil,
-  include_directories : [inc_common],
-  c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
-  cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
+  cpp_args : [cpp_msvc_compat_args, _extra_args],
+  gnu_symbol_visibility : 'hidden',
+  build_by_default : false,
+)
+
+libglcpp_standalone = static_library(
+  'glcpp_standalone',
+  'pp_standalone_scaffolding.c',
+  link_with : libglcpp,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
+  cpp_args : [cpp_msvc_compat_args, _extra_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )
 
@@ -60,9 +71,10 @@ glcpp = executable(
   'glcpp',
   'glcpp.c',
   dependencies : [dep_m, idep_getopt],
-  include_directories : [inc_common],
-  link_with : [libglcpp, libglsl_util],
-  c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
+  link_with : [libglcpp_standalone, libglsl_util],
+  c_args : [no_override_init_args, c_msvc_compat_args],
+  gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )
 
@@ -83,6 +95,7 @@ if with_any_opengl and with_tests and host_machine.system() != 'windows'
         '--@0@'.format(m),
       ],
       suite : ['compiler', 'glcpp'],
+      timeout: 60,
     )
   endforeach
 endif