Import Mesa 18.3.2

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/mesa/src/gallium/targets/haiku-softpipe/meson.build b/lib/mesa/src/gallium/targets/haiku-softpipe/meson.build
index 2495779c9..619706d81 100644
--- a/lib/mesa/src/gallium/targets/haiku-softpipe/meson.build
+++ b/lib/mesa/src/gallium/targets/haiku-softpipe/meson.build
@@ -22,19 +22,19 @@ libswpipe = shared_library(
   'swpipe',
   files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
   include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
-    include_directories('../../frontends/hgl'),
+    inc_common, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
+    include_directories('../../state_trackers/hgl'),
     include_directories('/boot/system/develop/headers/private')
   ],
-  gnu_symbol_visibility : 'hidden',
+  c_args : [c_vis_args],
+  cpp_args : [cpp_vis_args],
   link_args : [ld_args_bsymbolic, ld_args_gc_sections],
   link_with : [
-    libglapi, libswhgl, libsthgl, libcompiler,
-    libmesa, libglsl, libgallium, libgl
+    libglapi, libswhgl, libsthgl, libmesa_util, libcompiler,
+    libmesa_gallium, libglsl, libnir, libgallium, libgl
   ],
   dependencies : [
     driver_swrast, cpp.find_library('be'), cpp.find_library('translation'),
-    cpp.find_library('network'), dep_unwind, idep_mesautil, idep_nir,
-  ],
-  install : true,
+    cpp.find_library('network'), dep_unwind
+  ]
 )