diff options
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/control_protocol/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/frontier/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/generic_midi/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/mackie/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/osc/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/powermate/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/tranzport/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/wiimote/wscript | 14 | ||||
-rw-r--r-- | libs/surfaces/wscript | 14 |
9 files changed, 65 insertions, 61 deletions
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index a4afd68539..8c083ba9ec 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -10,27 +10,27 @@ APPNAME = 'libardour_cp' LIBARDOUR_CP_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' basic_ui.cc control_protocol.cc ''' - obj.export_incdirs = ['.', './control_protocol' ] + obj.export_includes = ['.', './control_protocol' ] obj.cxxflags = '-DPACKAGE="ardour_cp"' obj.includes = ['.', './control_protocol'] obj.name = 'libardour_cp' obj.target = 'ardourcp' - obj.uselib_local = 'libardour libtimecode' + obj.use = 'libardour libtimecode' obj.vnum = LIBARDOUR_CP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index cd388b8bff..c23b3cf3c9 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Version of this package (even if built as a child) @@ -16,10 +16,10 @@ APPNAME = 'libsurfaces' VERSION = LIBSURFACES_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -27,18 +27,18 @@ def configure(conf): def build(bld): # Generic MIDI - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' generic_midi_control_protocol.cc interface.cc midicontrollable.cc ''' - obj.export_incdirs = ['./generic_midi'] + obj.export_includes = ['./generic_midi'] obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' obj.includes = ['.', './generic_midi'] obj.name = 'libgeneric_midi' obj.target = 'generic_midi' - obj.uselib_local = 'libardour libsurfaces' + obj.use = 'libardour libsurfaces' obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 9111df5982..6daf413b66 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,17 +9,17 @@ import os LIBARDOUR_GENERIC_MIDI_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' generic_midi_control_protocol.cc gmcp_gui.cc @@ -29,13 +29,13 @@ def build(bld): midifunction.cc midiaction.cc ''' - obj.export_incdirs = ['.'] + obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' obj.includes = ['.', './generic_midi'] obj.name = 'libardour_generic_midi' obj.target = 'ardour_generic_midi' obj.uselib = 'GTKMM GTK GDK' - obj.uselib_local = 'libardour libardour_cp libgtkmm2ext libpbd' + obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index f091acb148..ba8b8e5b4b 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,17 +9,17 @@ import os LIBARDOUR_MCP_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' bcf_surface.cc bcf_surface_generated.cc @@ -41,13 +41,13 @@ def build(bld): surface_port.cc types.cc ''' - obj.export_incdirs = ['./mackie'] + obj.export_includes = ['./mackie'] obj.cxxflags = '-DPACKAGE="ardour_mackie"' obj.includes = ['.', './mackie'] obj.name = 'libardour_mcp' obj.target = 'ardour_mcp' obj.uselib = 'GTKMM' - obj.uselib_local = 'libardour libardour_cp libgtkmm2ext' + obj.use = 'libardour libardour_cp libgtkmm2ext' obj.vnum = LIBARDOUR_MCP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 4d62bda7bc..1ab9bf42a7 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,10 +9,10 @@ import os LIBARDOUR_OSC_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): @@ -20,20 +20,20 @@ def configure(conf): autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo') def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' osc.cc osc_controllable.cc osc_route_observer.cc interface.cc ''' - obj.export_incdirs = ['.'] + obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="ardour_cp"' obj.includes = ['.', './osc'] obj.name = 'libardour_osc' obj.target = 'ardour_osc' obj.uselib = ' LO ' - obj.uselib_local = 'libardour libardour_cp libpbd' + obj.use = 'libardour libardour_cp libpbd' obj.vnum = LIBARDOUR_OSC_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript index 6f263fc9a0..fb97607169 100644 --- a/libs/surfaces/powermate/wscript +++ b/libs/surfaces/powermate/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,27 +9,27 @@ import os LIBARDOUR_POWERMATE_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' interface.cc powermate.cc ''' - obj.export_incdirs = ['.'] + obj.export_includes = ['.'] obj.cxxflags = '-DPACKAGE="ardour_powermate"' obj.includes = ['.' ] obj.name = 'libpowermate' obj.target = 'powermate' - obj.uselib_local = 'libardour libardour_cp' + obj.use = 'libardour libardour_cp' obj.vnum = LIBARDOUR_POWERMATE_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 7a7d5d2a05..311a9a2045 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,17 +9,17 @@ import os LIBARDOUR_TRANZPORT_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' button_events.cc buttons.cc @@ -38,12 +38,12 @@ def build(bld): wheel.cc wheel_modes.cc ''' - obj.export_incdirs = ['./tranzport'] + obj.export_includes = ['./tranzport'] obj.cxxflags = '-DPACKAGE="ardour_tranzport"' obj.includes = ['.', './tranzport'] obj.name = 'libardour_tranzport' obj.target = 'ardour_tranzport' - obj.uselib_local = 'libardour libardour_cp' + obj.use = 'libardour libardour_cp' obj.vnum = LIBARDOUR_TRANZPORT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index 3c4650ca9b..3fbea7e248 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import os # Library version (UNIX style major, minor, micro) @@ -9,27 +9,27 @@ import os LIBARDOUR_WIIMOTE_LIB_VERSION = '4.1.0' # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' -def set_options(opt): +def options(opt): autowaf.set_options(opt) def configure(conf): autowaf.configure(conf) def build(bld): - obj = bld.new_task_gen('cxx', 'shlib') + obj = bld(features = 'cxx cxxshlib') obj.source = ''' wiimote.cc interface.cc ''' - obj.export_incdirs = ['./wiimote'] + obj.export_includes = ['./wiimote'] obj.cxxflags = '-DPACKAGE="ardour_wiimote"' obj.includes = ['.', './wiimote'] obj.name = 'libwiimote' obj.target = 'wiimote' - obj.uselib_local = 'libardour libardour_cp' + obj.use = 'libardour libardour_cp' obj.vnum = LIBARDOUR_WIIMOTE_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces') diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 1b9d5c7091..9f5c4749e7 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -1,5 +1,5 @@ #!/usr/bin/env python -import autowaf +from waflib.extras import autowaf as autowaf import Options # Version of this package (even if built as a child) @@ -16,8 +16,8 @@ APPNAME = 'libsurfaces' VERSION = LIBSURFACES_VERSION # Mandatory variables -srcdir = '.' -blddir = 'build' +top = '.' +out = 'build' children = [ 'control_protocol', @@ -30,7 +30,7 @@ children = [ 'wiimote' ] -def set_options(opt): +def options(opt): autowaf.set_options(opt) def sub_config_and_use(conf, name, has_objects = True): @@ -44,7 +44,11 @@ def 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') + autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False) + if conf.env['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') conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC') |