X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fwscript;h=7ab04ef9f8fc82c91390117dd722d83842a902a6;hb=cb0189845ea1162af2206ce77d0dddfcb61a236b;hp=9f5c4749e7e85700a67921d189dca44ddd30b656;hpb=723ab60b39aed9a9190e047fc5803c1f4e1adac3;p=ardour.git

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 9f5c4749e7..7ab04ef9f8 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
-import Options
+from waflib import Options
 
 # Version of this package (even if built as a child)
 LIBSURFACES_VERSION = '4.1.0'
@@ -21,60 +21,71 @@ out = 'build'
 
 children = [
         'control_protocol',
-        'frontier',
+        'faderport',
+        'cc121',
         'generic_midi',
         'mackie',
-        'osc',
-        'powermate',
-        'tranzport',
-        'wiimote'
 ]
 
 def options(opt):
     autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-    conf.sub_config(name)
+    conf.recurse(name)
     autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
+    global children
+
     autowaf.set_recursive()
     autowaf.configure(conf)
 
+    autowaf.check_pkg(conf, 'libusb-1.0', uselib_store='USB', mandatory=False)
+    #if Options.options.tranzport and conf.is_defined('HAVE_USB'):
+    #    conf.define('BUILD_TRANZPORT', 1)
+
+    if conf.is_defined('HAVE_USB'):
+        children += [ 'push2' ]
+    else:
+        print ('You are missing the libusb-1.0 development package needed to compile Push2 support')
+    
+    if autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"):
+        children += [ 'osc' ]
+
+    conf.check_cc (header_name='cwiid.h', define_name='HAVE_CWIID_H',mandatory=False)
+    if conf.is_defined('HAVE_CWIID_H'):
+        conf.check_cc (header_name='bluetooth/bluetooth.h', define_name='HAVE_BLUETOOTH_H',mandatory=False)
+        if conf.is_defined('HAVE_BLUETOOTH_H'):
+            autowaf.check_pkg(conf, 'cwiid', uselib_store='CWIID', atleast_version='0.6.00',mandatory=False)
+            if conf.is_defined ('HAVE_CWIID'):
+                conf.define ('BUILD_WIIMOTE', 1)
+                children += [ 'wiimote' ]
+            else:
+                print('You have the cwiid headers needed to compile wiimote support BUT you are missing the pkg-config file for cwiid')
+        else:
+            print('You are missing the libbluetooth headers needed to compile wiimote support')
+    else:
+            print('You are missing the cwiid headers needed to compile wiimote support')
+
     for i in children:
         sub_config_and_use(conf, i)
 
-    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')
-
-    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')
-    bld.add_subdirs('mackie')
-    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')
+    bld.recurse('control_protocol')
+    bld.recurse('generic_midi')
+    bld.recurse('faderport')
+    bld.recurse('cc121')
+    bld.recurse('mackie')
+
+    if bld.is_defined ('HAVE_LO'):
+        bld.recurse('osc')
+    if bld.is_defined('BUILD_WIIMOTE'):
+        bld.recurse('wiimote')
+    if bld.is_defined('BUILD_TRANZPORT'):
+        bld.recurse('tranzport')
+    if bld.is_defined('HAVE_USB'):
+        bld.recurse('push2')
 
 def shutdown():
     autowaf.shutdown()