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

Adjust meson build to make the sources buildable against JACK1 versions without UUID

This commit is contained in:
Nedko Arnaudov 2023-07-28 17:26:58 +03:00
parent 8098bea80f
commit fc39058589
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
example-clients/meson.build
View File

@ -28,14 +28,14 @@ exe_jack_impulse_grabber = executable(
install: true
)
lib_jack_inprocess = library(
'jack_inprocess',
name_prefix: '',
sources: ['inprocess.c'],
dependencies: [dep_jack],
install: true,
install_dir: get_option('libdir') / 'jack',
)
#lib_jack_inprocess = library(
# 'jack_inprocess',
# name_prefix: '',
# sources: ['inprocess.c'],
# dependencies: [dep_jack],
# install: true,
# install_dir: get_option('libdir') / 'jack',
#)
lib_jack_internal_metro = library(
'jack_internal_metro',
@ -46,14 +46,14 @@ lib_jack_internal_metro = library(
install_dir: get_option('libdir') / 'jack',
)
lib_jack_intime = library(
'jack_intime',
name_prefix: '',
sources: ['intime.c'],
dependencies: [dep_jack],
install: true,
install_dir: get_option('libdir') / 'jack',
)
#lib_jack_intime = library(
# 'jack_intime',
# name_prefix: '',
# sources: ['intime.c'],
# dependencies: [dep_jack],
# install: true,
# install_dir: get_option('libdir') / 'jack',
#)
exe_jack_latent_client = executable(
'jack_latent_client',
@ -106,18 +106,18 @@ if build_jack_net
)
endif
if has_jackctl_server_create2
c_args_jack_server_control = c_args_common + ['-D__JACK2__']
else
c_args_jack_server_control = c_args_common + ['-D__JACK1__']
endif
exe_jack_server_control = executable(
'jack_server_control',
c_args: c_args_jack_server_control,
sources: ['server_control.c'],
dependencies: [lib_jackserver],
install: true
)
# if has_jackctl_server_create2
# c_args_jack_server_control = c_args_common + ['-D__JACK2__']
# else
# c_args_jack_server_control = c_args_common + ['-D__JACK1__']
# endif
# exe_jack_server_control = executable(
# 'jack_server_control',
# c_args: c_args_jack_server_control,
# sources: ['server_control.c'],
# dependencies: [lib_jackserver],
# install: true
# )
exe_jack_showtime = executable(
'jack_showtime',

5
meson.build
View File

@ -69,10 +69,11 @@ lib_jacknet = declare_dependency(
include_directories: include_directories_common,
)
jack_implementation = ''
jack_implementation = dep_jack.get_variable('jack_implementation')
if jack_implementation == ''
warning('No compatible jack implementation detected. This may mean conflicting files when installing!')
message('JACK implementation: unknown')
else
message('JACK implementation: ' + jack_implementation)
endif
has_jack1_internal_client = cc.compiles(

26
tools/meson.build
View File

@ -46,12 +46,12 @@ meson.add_install_script(
)
endif
exe_jack_evmon = executable(
'jack_evmon',
sources: ['evmon.c'],
dependencies: [dep_jack],
install: true
)
#exe_jack_evmon = executable(
# 'jack_evmon',
# sources: ['evmon.c'],
# dependencies: [dep_jack],
# install: true
#)
exe_jack_freewheel = executable(
'jack_freewheel',
@ -145,12 +145,12 @@ if build_jack_netsource
)
endif
exe_jack_property = executable(
'jack_property',
sources: ['property.c'],
dependencies: [dep_jack],
install: true
)
#exe_jack_property = executable(
# 'jack_property',
# sources: ['property.c'],
# dependencies: [dep_jack],
# install: true
#)
exe_jack_samplerate = executable(
'jack_samplerate',
@ -199,5 +199,5 @@ exe_jack_wait = executable(
)
if build_zalsa
subdir('zalsa')
# subdir('zalsa')
endif