X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fbroadcom%2Fmeson.build;h=70406b2f1fbfdef00c7e143a673210079c000bfa;hp=6721966c7cf11428457a76475096c87d0231a299;hb=08f1746fad7cdcd58a2b94ae523274670eb7e67e;hpb=34898c8c45a5cbb84a027d74854efb1486d65bc4

diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 6721966c7cf..70406b2f1fb 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -22,33 +22,44 @@ inc_broadcom = include_directories('.', 'cle')
 
 subdir('cle')
 
-vc5_versions = ['33', '41']
+v3d_versions = ['33', '41', '42']
+v3d_libs = []
 
-if with_gallium_vc5
+if with_gallium_v3d
   subdir('compiler')
   subdir('qpu')
+  subdir('simulator')
+endif
 
-  per_version_libs = []
-  foreach ver : vc5_versions
-    per_version_libs += static_library(
-      'libbroadcom-v' + ver,
-      files('clif/v3dx_dump.c'),
-      include_directories : [inc_common, inc_broadcom, inc_src],
-      c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
-      dependencies: [dep_valgrind, dep_thread],
-    )
-  endforeach
+if with_tools.contains('drm-shim')
+  subdir('drm-shim')
+endif
 
-  libbroadcom_vc5 = static_library(
-    'libbroadcom_vc5',
+per_version_libs = []
+foreach ver : v3d_versions
+  per_version_libs += static_library(
+    'libbroadcom-v' + ver,
     [
-      files('common/v3d_debug.c', 'clif/clif_dump.c'),
-      v3d_xml_pack,
+      files('clif/v3dx_dump.c'),
+      v3d_xml_pack
     ],
-    include_directories : [inc_common, inc_broadcom, inc_src],
-    c_args : [c_vis_args, no_override_init_args],
-    link_whole : [libbroadcom_compiler, libbroadcom_qpu] + per_version_libs,
-    build_by_default : false,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
+    c_args : [no_override_init_args, '-DV3D_VERSION=' + ver],
+    gnu_symbol_visibility : 'hidden',
     dependencies: [dep_valgrind, dep_thread],
   )
-endif
+endforeach
+
+libbroadcom_v3d = static_library(
+  'libbroadcom_v3d',
+  [
+    files('common/v3d_debug.c', 'common/v3d_device_info.c', 'clif/clif_dump.c'),
+    v3d_xml_pack,
+  ],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
+  c_args : [no_override_init_args],
+  gnu_symbol_visibility : 'hidden',
+  link_whole : v3d_libs + per_version_libs,
+  build_by_default : false,
+  dependencies: [dep_valgrind, dep_thread],
+)