New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Virtual device #41

Merged
merged 122 commits into from Oct 2, 2017
Commits
Jump to file or symbol
Failed to load files and symbols.
+4 −5
Diff settings

Always

Just for now

Viewing a subset of changes. View all

meson: rework avtka library tracking and depends

This removes -lavtka from the link command when it was not
found, just a correctness cleanup.

Signed-off-by: Harry van Haaren <harryhaaren@gmail.com>
  • Loading branch information...
harryhaaren committed Aug 27, 2017
commit 28ff53cd3441a18705c67e63c97f53b581ba05f7
View
@@ -4,8 +4,6 @@ ctlra_src = files('ctlra.c', 'event.c', 'usb.c', 'midi.c')
jack = dependency('jack', required: false)
conf_data.set('jack', jack.found())
avtka = dependency('openav_avtka', required: false)
subdir('devices')
libusb = dependency('libusb-1.0')
View
@@ -6,20 +6,21 @@ conf_data.set('version', '0.1')
cc = meson.get_compiler('c')
required_libs = ['libusb-1.0', 'alsa']
avtka = dependency('openav_avtka', required: false)
if(avtka.found())
add_global_arguments('-DHAVE_AVTKA', language : 'c')
required_libs += 'openav_avtka'
endif
subdir('ctlra')
pkg = import('pkgconfig')
pkg.generate(name: 'openav_ctlra',
description: 'OpenAV Ctlra Library',
version: conf_data.get('version'),
requires: ['libusb-1.0', 'alsa'],
dependencies: avtka,
requires: required_libs,
libraries: ctlra)
install_headers(ctlra_hdr, subdir : 'ctlra')
ProTip! Use n and p to navigate between commits in a pull request.