From c8d76d9c92a39a84b7cbfb0e5a233bf5f909d7ba Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sun, 29 Nov 2020 14:56:13 +0100
Subject: [PATCH] Add proper dependencies for the entire VST3 SDK

---
 meson.build           | 21 +++++++++++++++++++--
 subprojects/vst3.wrap |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 544e1dad..fc40675f 100644
--- a/meson.build
+++ b/meson.build
@@ -77,6 +77,14 @@ if with_vst3
   vst3 = subproject('vst3', version : '3.7.1')
   vst3_compiler_options = vst3.get_variable('compiler_options')
   vst3_include_dir = vst3.get_variable('include_dir')
+  vst3_base_native = static_library(
+    'base_native',
+    vst3.get_variable('base_sources'),
+    cpp_args : vst3_compiler_options + ['-Wno-cpp'],
+    include_directories : vst3_include_dir,
+    override_options : ['warning_level=0'],
+    native : true,
+  )
   vst3_pluginterfaces_native = static_library(
     'pluginterfaces_native',
     vst3.get_variable('pluginterfaces_sources'),
@@ -85,8 +93,17 @@ if with_vst3
     override_options : ['warning_level=0'],
     native : true,
   )
-  vst3_pluginterfaces_native_dep = declare_dependency(
-    link_with : vst3_pluginterfaces_native,
+  vst3_sdk_native = static_library(
+    'sdk_native',
+    vst3.get_variable('sdk_common_sources') + vst3.get_variable('sdk_sources'),
+    link_with : [vst3_base_native, vst3_pluginterfaces_native],
+    cpp_args : vst3_compiler_options + ['-Wno-multichar'],
+    include_directories : vst3_include_dir,
+    override_options : ['warning_level=0'],
+    native : true,
+  )
+  vst3_sdk_native_dep = declare_dependency(
+    link_with : vst3_sdk_native,
     include_directories : vst3_include_dir,
   )
 else
diff --git a/subprojects/vst3.wrap b/subprojects/vst3.wrap
index b1a24457..395c2ce8 100644
--- a/subprojects/vst3.wrap
+++ b/subprojects/vst3.wrap
@@ -2,6 +2,6 @@
 url = https://github.com/robbert-vdh/vst3sdk.git
 # This is VST3 SDK v3.7.1_build_50 with the documentation and VSTGUI submodules
 # removed
-revision = 410f4e01d311f1608a193594a65b98db86758b95
+revision = d6d6ae0d33ada0c07a508b0e079d962464fa93cd
 clone-recursive = true
 depth = 1