diff options
Diffstat (limited to 'libs/surfaces')
-rw-r--r-- | libs/surfaces/control_protocol/wscript | 12 | ||||
-rw-r--r-- | libs/surfaces/generic_midi/wscript | 12 | ||||
-rw-r--r-- | libs/surfaces/osc/wscript | 21 | ||||
-rw-r--r-- | libs/surfaces/powermate/wscript | 10 | ||||
-rw-r--r-- | libs/surfaces/tranzport/wscript | 10 | ||||
-rw-r--r-- | libs/surfaces/wscript | 24 |
6 files changed, 54 insertions, 35 deletions
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index c084e33696..e8354e58d4 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -6,7 +6,7 @@ import os # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' +LIBARDOUR_CP_LIB_VERSION = '4.1.0' # Mandatory variables srcdir = '.' @@ -25,13 +25,13 @@ def build(bld): control_protocol.cc smpte.cc ''' - obj.export_incdirs = ['.'] + obj.export_incdirs = ['.', './control_protocol' ] obj.cxxflags = '-DPACKAGE="ardour_cp"' - obj.includes = ['.'] - obj.name = 'libsurfaces' - obj.target = 'surfaces' + obj.includes = ['.', './control_protocol'] + obj.name = 'libardour_cp' + obj.target = 'ardourcp' obj.uselib_local = 'libardour' - obj.vnum = LIBSURFACES_LIB_VERSION + obj.vnum = LIBARDOUR_CP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') def shutdown(): diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index 4993d24ef9..c26643e656 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -6,7 +6,7 @@ import os # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' +LIBARDOUR_GENERIC_MIDI_LIB_VERSION = '4.1.0' # Mandatory variables srcdir = '.' @@ -25,13 +25,13 @@ def build(bld): interface.cc midicontrollable.cc ''' - obj.export_incdirs = ['./generic_midi'] + obj.export_incdirs = ['.'] obj.cxxflags = '-DPACKAGE="ardour_genericmidi"' obj.includes = ['.', './generic_midi'] - obj.name = 'libgeneric_midi' - obj.target = 'generic_midi' - obj.uselib_local = 'libardour libsurfaces' - obj.vnum = LIBSURFACES_LIB_VERSION + obj.name = 'libardour_generic_midi' + obj.target = 'ardour_generic_midi' + obj.uselib_local = 'libardour libardour_cp' + obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') def shutdown(): diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index 748b0f6940..d254d00313 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -2,18 +2,11 @@ import autowaf import os -# Version of this package (even if built as a child) -LIBSURFACES_VERSION = '4.1.0' - # Library version (UNIX style major, minor, micro) # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' - -# Variables for 'waf dist' -APPNAME = 'libsurfaces' -VERSION = LIBSURFACES_VERSION +LIBARDOUR_OSC_LIB_VERSION = '4.1.0' # Mandatory variables srcdir = '.' @@ -24,6 +17,7 @@ def set_options(opt): def configure(conf): autowaf.configure(conf) + autowaf.check_pkg(conf, 'liblo', uselib_store='LO') def build(bld): obj = bld.new_task_gen('cxx', 'shlib') @@ -32,13 +26,14 @@ def build(bld): osc_controllable.cc interface.cc ''' - obj.export_incdirs = ['./osc'] + obj.export_incdirs = ['.'] obj.cxxflags = '-DPACKAGE="ardour_cp"' obj.includes = ['.', './osc'] - obj.name = 'libsurfaces' - obj.target = 'surfaces' - obj.uselib_local = 'libardour' - obj.vnum = LIBSURFACES_LIB_VERSION + obj.name = 'libardour_osc' + obj.target = 'osc' + obj.uselib = ' LO ' + obj.uselib_local = 'libardour libardour_cp' + obj.vnum = LIBARDOUR_OSC_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') def shutdown(): diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript index 3d08b1a40a..f8dd55c515 100644 --- a/libs/surfaces/powermate/wscript +++ b/libs/surfaces/powermate/wscript @@ -6,7 +6,7 @@ import os # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' +LIBARDOUR_POWERMATE_LIB_VERSION = '4.1.0' # Mandatory variables srcdir = '.' @@ -24,13 +24,13 @@ def build(bld): interface.cc powermate.cc ''' - obj.export_incdirs = ['./powermate'] + obj.export_incdirs = ['.'] obj.cxxflags = '-DPACKAGE="ardour_powermate"' - obj.includes = ['.', './powermate'] + obj.includes = ['.' ] obj.name = 'libpowermate' obj.target = 'powermate' - obj.uselib_local = 'libardour libsurfaces' - obj.vnum = LIBSURFACES_LIB_VERSION + obj.uselib_local = 'libardour libardour_cp' + obj.vnum = LIBARDOUR_POWERMATE_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') def shutdown(): diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index dec4b9c1d3..a5181566c2 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -6,7 +6,7 @@ import os # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' +LIBARDOUR_TRANZPORT_LIB_VERSION = '4.1.0' # Mandatory variables srcdir = '.' @@ -41,10 +41,10 @@ def build(bld): obj.export_incdirs = ['./tranzport'] obj.cxxflags = '-DPACKAGE="ardour_tranzport"' obj.includes = ['.', './tranzport'] - obj.name = 'libtranzport' - obj.target = 'tranzport' - obj.uselib_local = 'libardour libsurfaces' - obj.vnum = LIBSURFACES_LIB_VERSION + obj.name = 'libardour_tranzport' + obj.target = 'ardour_tranzport' + obj.uselib_local = 'libardour libardour_cp' + obj.vnum = LIBARDOUR_TRANZPORT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') def shutdown(): diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index bd37af7426..d629e6ab8e 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -1,5 +1,6 @@ #!/usr/bin/env python import autowaf +import Options # Version of this package (even if built as a child) LIBSURFACES_VERSION = '4.1.0' @@ -24,9 +25,32 @@ def set_options(opt): def configure(conf): autowaf.configure(conf) + 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') + + if Options.options.wiimote: + conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H') + if not conf.env['HAVE_CWIID_H']: + print 'WIIMOTE configured but you are missing libcwiid!' + sys.exit(1) + conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H') + if not conf.env['HAVE_BLUETOOTH_H']: + print 'WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!' + sys.exit(1) + conf.define ('BUILD_WIIMOTE', 1) + def build(bld): bld.add_subdirs('control_protocol') bld.add_subdirs('generic_midi') + if bld.env['BUILD_OSC']: + bld.add_subdirs('osc') + if bld.env['BUILD_POWERMATE']: + bld.add_subdirs('powermate') + if bld.env['BUILD_WIIMOTE']: + bld.add_subdirs('wiimote') + if bld.env['BUILD_TRANZPORT']: + bld.add_subdirs('tranzport') def shutdown(): autowaf.shutdown() |