Make sure wscripts under libs/surfaces/* are configured. This fixes the OSC surface build, as it now links with liblo.
git-svn-id: svn://localhost/ardour2/branches/3.0@5625 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c30dbaad0e
commit
285b59a7b9
|
@ -18,11 +18,6 @@ def set_options(opt):
|
|||
def configure(conf):
|
||||
autowaf.configure(conf)
|
||||
autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
|
||||
conf.env.append_value('LINKFLAGS_LO', '-llo')
|
||||
#
|
||||
# TODO: Again this append_value shouldn't be necessary really
|
||||
# but for some reason the link flag is not being added otherwise.
|
||||
#
|
||||
|
||||
def build(bld):
|
||||
obj = bld.new_task_gen('cxx', 'shlib')
|
||||
|
|
|
@ -19,12 +19,31 @@ VERSION = LIBSURFACES_VERSION
|
|||
srcdir = '.'
|
||||
blddir = 'build'
|
||||
|
||||
children = [
|
||||
'control_protocol',
|
||||
'frontier',
|
||||
'generic_midi',
|
||||
'mackie',
|
||||
'osc',
|
||||
'powermate',
|
||||
'tranzport',
|
||||
'wiimote'
|
||||
]
|
||||
|
||||
def set_options(opt):
|
||||
autowaf.set_options(opt)
|
||||
|
||||
def sub_config_and_use(conf, name, has_objects = True):
|
||||
conf.sub_config(name)
|
||||
autowaf.set_local_lib(conf, name, has_objects)
|
||||
|
||||
def configure(conf):
|
||||
autowaf.set_recursive()
|
||||
autowaf.configure(conf)
|
||||
|
||||
for i in children:
|
||||
sub_config_and_use(conf, i)
|
||||
|
||||
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')
|
||||
conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
|
||||
|
|
Loading…
Reference in New Issue