LADI
/
jack-tools
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split lib deps from specialized lib defines 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-02-03 10:40:21 +01:00
parent b6d74a88e8
commit 59a1059a1a
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meson.build
View File

@ -47,19 +47,21 @@ else
lib_jackserver_suffix = ''
endif
lib_jackserver_dep = cc.find_library('jackserver' + lib_jackserver_suffix,
dirs: [dep_jack.get_variable('libdir'), get_option('prefix') + '/lib'],
required: true
)
lib_jackserver = declare_dependency(
dependencies: cc.find_library('jackserver' + lib_jackserver_suffix,
dirs: [dep_jack.get_variable('libdir'), get_option('prefix') + '/lib'],
required: true
),
dependencies: lib_jackserver_dep,
include_directories: include_directories_common,
)
lib_jacknet_dep = cc.find_library('jacknet',
dirs: [dep_jack.get_variable('libdir'), get_option('prefix') + '/lib'],
required: get_option('jack_net')
)
lib_jacknet = declare_dependency(
dependencies: cc.find_library('jacknet',
dirs: [dep_jack.get_variable('libdir'), get_option('prefix') + '/lib'],
required: get_option('jack_net')
),
dependencies: lib_jacknet_dep,
include_directories: include_directories_common,
)
@ -140,7 +142,7 @@ endif
build_jack_net = false
# FIXME jacknet tools fail to build on windows
if get_option('jack_net').enabled() or (get_option('jack_net').auto() and lib_jacknet.found() and host_machine.system() != 'windows')
if get_option('jack_net').enabled() or (get_option('jack_net').auto() and lib_jacknet_dep.found() and host_machine.system() != 'windows')
build_jack_net = true
endif