ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

change detection system for liblo to use pkgconfig and test in only one place 

git-svn-id: svn://localhost/ardour2/branches/3.0@12194 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-05 20:04:30 +00:00
parent ffa2c2cf40
commit d8627637a5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/surfaces/osc/wscript
View File

@ -17,7 +17,6 @@ def options(opt):
def configure(conf):
autowaf.configure(conf)
autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
def build(bld):
obj = bld(features = 'cxx cxxshlib')

5
libs/surfaces/wscript
View File

@ -48,9 +48,8 @@ def configure(conf):
if Options.options.tranzport and conf.is_defined('HAVE_USB'):
conf.define('BUILD_TRANZPORT', 1)
#conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False)
conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC',mandatory=False)
autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")
if Options.options.wiimote:
conf.check_cc (header_name='cwiid.h', define_name='HAVE_CWIID_H')
@ -67,7 +66,7 @@ def build(bld):
bld.recurse('control_protocol')
bld.recurse('generic_midi')
bld.recurse('mackie')
if bld.is_defined ('BUILD_OSC'):
if bld.is_defined ('HAVE_LO'):
bld.recurse('osc')
if bld.is_defined('BUILD_POWERMATE'):
bld.recurse('powermate')