From e1e5c8beaeeb408c434bfb1021fd7258b3a7869d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 1 Jul 2021 15:12:39 +0200 Subject: [PATCH] Move the VST3 SDK patching --- src/common/vst3/meson.build | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/common/vst3/meson.build b/src/common/vst3/meson.build index 34821d35..0a3d5da6 100644 --- a/src/common/vst3/meson.build +++ b/src/common/vst3/meson.build @@ -1,10 +1,23 @@ # Meson does not allow mixing native and non native dependencies from # subprojects. The only workaround is to only define only the necessary # variables there, and to then assemble the dependencies here ourselves. + vst3 = subproject('vst3', version : '3.7.2') vst3_compiler_options = vst3.get_variable('compiler_options') vst3_include_dir = vst3.get_variable('include_dir') +# We need to do some minor hacking to get the SDK to compile with winegcc. Most +# notably some attributes are named differently, and the SDK uses 'Windows.h' +# instead of 'windows.h' like how the file is actually called. +# message(vst3_include_dir) +vst3_sdk_base_dir = vst3.get_variable('sdk_base_dir') +patch_result = run_command('../../../tools/patch-vst3-sdk.sh', vst3_sdk_base_dir) +if patch_result.returncode() == 0 + message(patch_result.stdout()) +else + error('Error while trying to patch the VST3 SDK:\n' + patch_result.stderr()) +endif + # We'll create a dependency for the plugin SDK for our native VST3 plugin vst3_base_native = static_library( 'base_native', @@ -32,19 +45,7 @@ vst3_sdk_native = static_library( override_options : ['warning_level=0'], ) -# And another dependency for the host SDK for our Wine host applications -# We need to do some minor hacking to get this to compile with winegcc. Most -# notably some attributes are named differently, and the SDK uses 'Windows.h' -# instead of 'windows.h' like how the file is actually called. -# message(vst3_include_dir) -vst3_sdk_base_dir = vst3.get_variable('sdk_base_dir') -patch_result = run_command('../../../tools/patch-vst3-sdk.sh', vst3_sdk_base_dir) -if patch_result.returncode() == 0 - message(patch_result.stdout()) -else - error('Error while trying to patch the VST3 SDK:\n' + patch_result.stderr()) -endif - +# And two more dependencies for the host SDK for our Wine host applications vst3_base_wine_64bit = static_library( 'vst3_base_wine_64bit', vst3.get_variable('base_sources'),