diff --git a/meson.build b/meson.build index 06ed4a64..71b1a75a 100644 --- a/meson.build +++ b/meson.build @@ -270,6 +270,8 @@ shared_library( native : true, include_directories : include_dir, dependencies : [ + configuration_dep, + boost_dep, with_32bit_libraries ? boost_filesystem_32bit_dep @@ -292,6 +294,8 @@ if with_vst3 native : true, include_directories : include_dir, dependencies : [ + configuration_dep, + boost_dep, with_32bit_libraries ? boost_filesystem_32bit_dep diff --git a/src/common/config/meson.build b/src/common/config/meson.build index ad6cf081..106dcfd9 100644 --- a/src/common/config/meson.build +++ b/src/common/config/meson.build @@ -27,3 +27,8 @@ version_header = vcs_tag( output : 'version.h', replace_string : '@VCS_VERSION@' ) + +configuration_dep = declare_dependency( + include_directories : include_directories('.'), + sources : [config_header, version_header], +) diff --git a/src/plugin/meson.build b/src/plugin/meson.build index 2fb168f2..efe1a25d 100644 --- a/src/plugin/meson.build +++ b/src/plugin/meson.build @@ -15,10 +15,7 @@ vst2_plugin_sources = files( 'host-process.cpp', 'utils.cpp', 'vst2-plugin.cpp', -) + [ - config_header, - version_header, -] +) vst3_plugin_sources = files( '../common/communication/common.cpp', @@ -91,7 +88,4 @@ vst3_plugin_sources = files( 'host-process.cpp', 'utils.cpp', 'vst3-plugin.cpp', -) + [ - config_header, - version_header, -] +) diff --git a/src/wine-host/meson.build b/src/wine-host/meson.build index c62c431d..d63d4db0 100644 --- a/src/wine-host/meson.build +++ b/src/wine-host/meson.build @@ -8,6 +8,8 @@ # doesn't have a way to customize that yet. if is_64bit_system host_64bit_deps = [ + configuration_dep, + boost_dep, boost_filesystem_64bit_dep, bitsery_dep, @@ -31,6 +33,8 @@ if with_bitbridge message('Bitbridge enabled, configuring a 32-bit host application') host_32bit_deps = [ + configuration_dep, + boost_dep, boost_filesystem_32bit_dep, bitsery_dep, @@ -136,17 +140,11 @@ endif # These will be linked against a static library made from `host_common_sources` individual_host_sources = files( 'individual-host.cpp', -) + [ - config_header, - version_header, -] +) group_host_sources = files( 'bridges/group.cpp', 'group-host.cpp', -) + [ - config_header, - version_header, -] +) if is_64bit_system host_common_64bit = static_library(