From 6efc69071e2b281c3fcf9124c99b2ac57ab2e2a3 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sat, 14 May 2022 13:17:56 +0200 Subject: [PATCH] Fix building with -Dvst3=false #180 --- CHANGELOG.md | 1 + src/plugin/meson.build | 178 +++++++++++++++++++------------------- src/wine-host/meson.build | 2 +- 3 files changed, 93 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfbafedc..101dbbd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,7 @@ Versioning](https://semver.org/spec/v2.0.0.html). Arch/Manjaro because of misreported parameter queue lengths. - Some of yabridge's socket file names contained extremely aesthetically unpleasing trailing underscores. Begone pesky underscores! +- Fixed building with VST3 support disabled. ### yabridgectl diff --git a/src/plugin/meson.build b/src/plugin/meson.build index 70862592..96782c55 100644 --- a/src/plugin/meson.build +++ b/src/plugin/meson.build @@ -14,19 +14,21 @@ vst2_plugin_deps = [ tomlplusplus_dep, ] -vst3_plugin_deps = [ - configuration_dep, +if with_vst3 + vst3_plugin_deps = [ + configuration_dep, - asio_dep, - bitsery_dep, - dl_dep, - function2_dep, - ghc_filesystem_dep, - rt_dep, - threads_dep, - tomlplusplus_dep, - vst3_sdk_native_dep, -] + asio_dep, + bitsery_dep, + dl_dep, + function2_dep, + ghc_filesystem_dep, + rt_dep, + threads_dep, + tomlplusplus_dep, + vst3_sdk_native_dep, + ] +endif vst2_plugin_sources = files( '../common/communication/common.cpp', @@ -48,78 +50,80 @@ vst2_plugin_sources = files( 'vst2-plugin.cpp', ) -vst3_plugin_sources = files( - '../common/communication/common.cpp', - '../common/logging/common.cpp', - '../common/logging/vst3.cpp', - '../common/serialization/vst3/component-handler/component-handler.cpp', - '../common/serialization/vst3/component-handler/component-handler-2.cpp', - '../common/serialization/vst3/component-handler/component-handler-3.cpp', - '../common/serialization/vst3/component-handler/component-handler-bus-activation.cpp', - '../common/serialization/vst3/component-handler/progress.cpp', - '../common/serialization/vst3/component-handler/unit-handler.cpp', - '../common/serialization/vst3/component-handler/unit-handler-2.cpp', - '../common/serialization/vst3/context-menu/context-menu.cpp', - '../common/serialization/vst3/host-context/host-application.cpp', - '../common/serialization/vst3/host-context/plug-interface-support.cpp', - '../common/serialization/vst3/plug-view/parameter-finder.cpp', - '../common/serialization/vst3/plug-view/plug-view.cpp', - '../common/serialization/vst3/plug-view/plug-view-content-scale-support.cpp', - '../common/serialization/vst3/plug-frame/plug-frame.cpp', - '../common/serialization/vst3/plugin/audio-presentation-latency.cpp', - '../common/serialization/vst3/plugin/audio-processor.cpp', - '../common/serialization/vst3/plugin/automation-state.cpp', - '../common/serialization/vst3/plugin/component.cpp', - '../common/serialization/vst3/plugin/connection-point.cpp', - '../common/serialization/vst3/plugin/edit-controller.cpp', - '../common/serialization/vst3/plugin/edit-controller-2.cpp', - '../common/serialization/vst3/plugin/edit-controller-host-editing.cpp', - '../common/serialization/vst3/plugin/info-listener.cpp', - '../common/serialization/vst3/plugin/keyswitch-controller.cpp', - '../common/serialization/vst3/plugin/midi-learn.cpp', - '../common/serialization/vst3/plugin/midi-mapping.cpp', - '../common/serialization/vst3/plugin/note-expression-controller.cpp', - '../common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp', - '../common/serialization/vst3/plugin/parameter-function-name.cpp', - '../common/serialization/vst3/plugin/plugin-base.cpp', - '../common/serialization/vst3/plugin/prefetchable-support.cpp', - '../common/serialization/vst3/plugin/process-context-requirements.cpp', - '../common/serialization/vst3/plugin/program-list-data.cpp', - '../common/serialization/vst3/plugin/unit-data.cpp', - '../common/serialization/vst3/plugin/unit-info.cpp', - '../common/serialization/vst3/plugin/xml-representation-controller.cpp', - '../common/serialization/vst3/plugin-factory/plugin-factory.cpp', - '../common/serialization/vst3/attribute-list.cpp', - '../common/serialization/vst3/base.cpp', - '../common/serialization/vst3/bstream.cpp', - '../common/serialization/vst3/component-handler-proxy.cpp', - '../common/serialization/vst3/connection-point-proxy.cpp', - '../common/serialization/vst3/context-menu-proxy.cpp', - '../common/serialization/vst3/context-menu-target.cpp', - '../common/serialization/vst3/event-list.cpp', - '../common/serialization/vst3/host-context-proxy.cpp', - '../common/serialization/vst3/message.cpp', - '../common/serialization/vst3/param-value-queue.cpp', - '../common/serialization/vst3/parameter-changes.cpp', - '../common/serialization/vst3/physical-ui-map-list.cpp', - '../common/serialization/vst3/plug-frame-proxy.cpp', - '../common/serialization/vst3/plug-view-proxy.cpp', - '../common/serialization/vst3/plugin-proxy.cpp', - '../common/serialization/vst3/plugin-factory-proxy.cpp', - '../common/serialization/vst3/process-data.cpp', - '../common/audio-shm.cpp', - '../common/configuration.cpp', - '../common/linking.cpp', - '../common/notifications.cpp', - '../common/plugins.cpp', - '../common/process.cpp', - '../common/utils.cpp', - '../include/llvm/small-vector.cpp', - 'bridges/vst3.cpp', - 'bridges/vst3-impls/plugin-factory-proxy.cpp', - 'bridges/vst3-impls/plug-view-proxy.cpp', - 'bridges/vst3-impls/plugin-proxy.cpp', - 'host-process.cpp', - 'utils.cpp', - 'vst3-plugin.cpp', -) +if with_vst3 + vst3_plugin_sources = files( + '../common/communication/common.cpp', + '../common/logging/common.cpp', + '../common/logging/vst3.cpp', + '../common/serialization/vst3/component-handler/component-handler.cpp', + '../common/serialization/vst3/component-handler/component-handler-2.cpp', + '../common/serialization/vst3/component-handler/component-handler-3.cpp', + '../common/serialization/vst3/component-handler/component-handler-bus-activation.cpp', + '../common/serialization/vst3/component-handler/progress.cpp', + '../common/serialization/vst3/component-handler/unit-handler.cpp', + '../common/serialization/vst3/component-handler/unit-handler-2.cpp', + '../common/serialization/vst3/context-menu/context-menu.cpp', + '../common/serialization/vst3/host-context/host-application.cpp', + '../common/serialization/vst3/host-context/plug-interface-support.cpp', + '../common/serialization/vst3/plug-view/parameter-finder.cpp', + '../common/serialization/vst3/plug-view/plug-view.cpp', + '../common/serialization/vst3/plug-view/plug-view-content-scale-support.cpp', + '../common/serialization/vst3/plug-frame/plug-frame.cpp', + '../common/serialization/vst3/plugin/audio-presentation-latency.cpp', + '../common/serialization/vst3/plugin/audio-processor.cpp', + '../common/serialization/vst3/plugin/automation-state.cpp', + '../common/serialization/vst3/plugin/component.cpp', + '../common/serialization/vst3/plugin/connection-point.cpp', + '../common/serialization/vst3/plugin/edit-controller.cpp', + '../common/serialization/vst3/plugin/edit-controller-2.cpp', + '../common/serialization/vst3/plugin/edit-controller-host-editing.cpp', + '../common/serialization/vst3/plugin/info-listener.cpp', + '../common/serialization/vst3/plugin/keyswitch-controller.cpp', + '../common/serialization/vst3/plugin/midi-learn.cpp', + '../common/serialization/vst3/plugin/midi-mapping.cpp', + '../common/serialization/vst3/plugin/note-expression-controller.cpp', + '../common/serialization/vst3/plugin/note-expression-physical-ui-mapping.cpp', + '../common/serialization/vst3/plugin/parameter-function-name.cpp', + '../common/serialization/vst3/plugin/plugin-base.cpp', + '../common/serialization/vst3/plugin/prefetchable-support.cpp', + '../common/serialization/vst3/plugin/process-context-requirements.cpp', + '../common/serialization/vst3/plugin/program-list-data.cpp', + '../common/serialization/vst3/plugin/unit-data.cpp', + '../common/serialization/vst3/plugin/unit-info.cpp', + '../common/serialization/vst3/plugin/xml-representation-controller.cpp', + '../common/serialization/vst3/plugin-factory/plugin-factory.cpp', + '../common/serialization/vst3/attribute-list.cpp', + '../common/serialization/vst3/base.cpp', + '../common/serialization/vst3/bstream.cpp', + '../common/serialization/vst3/component-handler-proxy.cpp', + '../common/serialization/vst3/connection-point-proxy.cpp', + '../common/serialization/vst3/context-menu-proxy.cpp', + '../common/serialization/vst3/context-menu-target.cpp', + '../common/serialization/vst3/event-list.cpp', + '../common/serialization/vst3/host-context-proxy.cpp', + '../common/serialization/vst3/message.cpp', + '../common/serialization/vst3/param-value-queue.cpp', + '../common/serialization/vst3/parameter-changes.cpp', + '../common/serialization/vst3/physical-ui-map-list.cpp', + '../common/serialization/vst3/plug-frame-proxy.cpp', + '../common/serialization/vst3/plug-view-proxy.cpp', + '../common/serialization/vst3/plugin-proxy.cpp', + '../common/serialization/vst3/plugin-factory-proxy.cpp', + '../common/serialization/vst3/process-data.cpp', + '../common/audio-shm.cpp', + '../common/configuration.cpp', + '../common/linking.cpp', + '../common/notifications.cpp', + '../common/plugins.cpp', + '../common/process.cpp', + '../common/utils.cpp', + '../include/llvm/small-vector.cpp', + 'bridges/vst3.cpp', + 'bridges/vst3-impls/plugin-factory-proxy.cpp', + 'bridges/vst3-impls/plug-view-proxy.cpp', + 'bridges/vst3-impls/plugin-proxy.cpp', + 'host-process.cpp', + 'utils.cpp', + 'vst3-plugin.cpp', + ) +endif diff --git a/src/wine-host/meson.build b/src/wine-host/meson.build index 8ab34796..9ff0d195 100644 --- a/src/wine-host/meson.build +++ b/src/wine-host/meson.build @@ -37,13 +37,13 @@ if with_bitbridge function2_dep, rt_dep, tomlplusplus_dep, + wine_ole32_dep, wine_threads_dep, xcb_32bit_dep, ] if with_vst3 host_32bit_deps += [ vst3_sdk_hosting_wine_32bit_dep, - wine_ole32_dep, wine_shell32_dep, wine_uuid_dep, ]