integrated rz-svd into subprojects

librz/bin/meson.build

@@ -304,6 +304,16 @@ rz_bin_sources = [
   'dwarf/dwarf.c',
 ]
 
+# Try to get the rz_svd dependency from the subproject
+rz_svd_proj = subproject('rz-svd', required: false)
+if rz_svd_proj.found()
+  rz_svd_dep = rz_svd_proj.get_variable('rz_svd_dep')
+  message('Found rz-svd subproject dependency')
+else
+  rz_svd_dep = dependency('', required: false)
+  message('rz-svd subproject not found')
+endif
+
 rz_bin_inc = [platform_inc, include_directories('format')]
 
 rz_bin = library('rz_bin', rz_bin_sources,
@@ -324,6 +334,7 @@ rz_bin = library('rz_bin', rz_bin_sources,
     rz_io_dep,
     rz_type_dep,
     libmspack_dep,
+    rz_svd_dep,
   ],
   install: true,
   implicit_include_directories: false,

librz/core/meson.build

@@ -187,7 +187,8 @@ rz_core = library('rz_core', rz_core_sources,
 )
 
 rz_core_dep = declare_dependency(link_with: rz_core,
-                                include_directories: rz_core_inc)
+                                include_directories: rz_core_inc,
+                                dependencies: rz_core_deps)
 meson.override_dependency('rz_core', rz_core_dep)
 
 modules += { 'rz_core': {

meson.build

@@ -714,6 +714,27 @@ endif
 yxml_proj = subproject('yxml', default_options: ['default_library=static'])
 yxml_dep = yxml_proj.get_variable('yxml_dep')
 
+# handle rz-svd dependency
+r = run_command(py3_exe, check_meson_subproject_py, 'rz-svd', check: false)
+if r.returncode() == 1 and get_option('subprojects_check')
+  error(subproject_clean_error_msg)
+endif
+
+rz_include_dep = declare_dependency(include_directories: [
+  include_directories('librz/include'),
+  include_directories('.')  # for generated headers like rz_userconf.h
+])
+
+rz_svd_proj = subproject(
+  'rz-svd',
+  default_options: [
+    'default_library=static',
+    'werror=false',
+  ]
+)
+
+rz_svd_dep = rz_svd_proj.get_variable('rz_svd_dep')
+
 use_rpath = false
 use_rpath_absolute = false
 if host_machine.system() != 'windows' and get_option('default_library') == 'shared'

subprojects/rz-svd/meson.build

@@ -0,0 +1,45 @@
+project('rz-svd', 'c',
+  version: '0.1.0',
+  license: 'LGPL3',
+  meson_version: '>=0.55.0',
+    default_options: [
+    'buildtype=debugoptimized',
+    'b_vscrt=from_buildtype',
+  ]
+)
+
+# handle dependencies
+yxml_proj = subproject('yxml', default_options: ['default_library=static'])
+yxml_dep = yxml_proj.get_variable('yxml_dep')
+
+# TEMPORARY: Include Rizin headers directly until proper dependency management is set up
+# These paths generate sandbox warnings but are necessary for compilation
+rz_include_dep = declare_dependency(
+  include_directories: [
+    include_directories('../../librz/include'),
+    include_directories('../../'),
+    include_directories('../../librz/util/sdb/src'),
+  ]
+)
+
+inc = include_directories('.')
+
+rz_svd = library('rz_svd',
+  ['rz_svd.c'],
+  dependencies: [
+    yxml_dep,
+    rz_include_dep,
+  ],
+  install: true,
+  soversion: '0',
+  version: '0.1.0',
+)
+
+rz_svd_dep = declare_dependency(
+  link_with: rz_svd,
+  include_directories: inc,
+  dependencies: [yxml_dep],
+)
+
+# Install header
+install_headers('rz_svd.h', subdir: 'librz')