Include the configuration as a dependency

Apparently this wasn't even supposed to work, so it's probably a good
idea to do it properly before things break.
This commit is contained in:
Robbert van der Helm
2021-07-13 21:51:27 +02:00
parent 3dfb17cf5e
commit 4013aea63a
4 changed files with 17 additions and 16 deletions
+4
View File
@@ -270,6 +270,8 @@ shared_library(
native : true, native : true,
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
configuration_dep,
boost_dep, boost_dep,
with_32bit_libraries with_32bit_libraries
? boost_filesystem_32bit_dep ? boost_filesystem_32bit_dep
@@ -292,6 +294,8 @@ if with_vst3
native : true, native : true,
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
configuration_dep,
boost_dep, boost_dep,
with_32bit_libraries with_32bit_libraries
? boost_filesystem_32bit_dep ? boost_filesystem_32bit_dep
+5
View File
@@ -27,3 +27,8 @@ version_header = vcs_tag(
output : 'version.h', output : 'version.h',
replace_string : '@VCS_VERSION@' replace_string : '@VCS_VERSION@'
) )
configuration_dep = declare_dependency(
include_directories : include_directories('.'),
sources : [config_header, version_header],
)
+2 -8
View File
@@ -15,10 +15,7 @@ vst2_plugin_sources = files(
'host-process.cpp', 'host-process.cpp',
'utils.cpp', 'utils.cpp',
'vst2-plugin.cpp', 'vst2-plugin.cpp',
) + [ )
config_header,
version_header,
]
vst3_plugin_sources = files( vst3_plugin_sources = files(
'../common/communication/common.cpp', '../common/communication/common.cpp',
@@ -91,7 +88,4 @@ vst3_plugin_sources = files(
'host-process.cpp', 'host-process.cpp',
'utils.cpp', 'utils.cpp',
'vst3-plugin.cpp', 'vst3-plugin.cpp',
) + [ )
config_header,
version_header,
]
+6 -8
View File
@@ -8,6 +8,8 @@
# doesn't have a way to customize that yet. # doesn't have a way to customize that yet.
if is_64bit_system if is_64bit_system
host_64bit_deps = [ host_64bit_deps = [
configuration_dep,
boost_dep, boost_dep,
boost_filesystem_64bit_dep, boost_filesystem_64bit_dep,
bitsery_dep, bitsery_dep,
@@ -31,6 +33,8 @@ if with_bitbridge
message('Bitbridge enabled, configuring a 32-bit host application') message('Bitbridge enabled, configuring a 32-bit host application')
host_32bit_deps = [ host_32bit_deps = [
configuration_dep,
boost_dep, boost_dep,
boost_filesystem_32bit_dep, boost_filesystem_32bit_dep,
bitsery_dep, bitsery_dep,
@@ -136,17 +140,11 @@ endif
# These will be linked against a static library made from `host_common_sources` # These will be linked against a static library made from `host_common_sources`
individual_host_sources = files( individual_host_sources = files(
'individual-host.cpp', 'individual-host.cpp',
) + [ )
config_header,
version_header,
]
group_host_sources = files( group_host_sources = files(
'bridges/group.cpp', 'bridges/group.cpp',
'group-host.cpp', 'group-host.cpp',
) + [ )
config_header,
version_header,
]
if is_64bit_system if is_64bit_system
host_common_64bit = static_library( host_common_64bit = static_library(