X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fwscript;h=bc72446f692fdce4ae2fcf6d6a29c1c08a624299;hb=b81504581b524b230e65b3fb10a991c576bd1c8f;hp=f281247208df54c79b123ae26a1b44bda43a9d60;hpb=d8627637a5b35b888cc73f7a38b24d642dde5256;p=ardour.git

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index f281247208..bc72446f69 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -21,13 +21,9 @@ out = 'build'
 
 children = [
         'control_protocol',
-        'frontier',
+        'faderport',
         'generic_midi',
         'mackie',
-        'osc',
-        'powermate',
-        'tranzport',
-        'wiimote'
 ]
 
 def options(opt):
@@ -38,38 +34,45 @@ def sub_config_and_use(conf, name, has_objects = True):
     autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
+    global children
+
     autowaf.set_recursive()
     autowaf.configure(conf)
 
-    for i in children:
-        sub_config_and_use(conf, i)
+    #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)
 
-    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 autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24"):
+        children += [ 'osc' ]
 
-    conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE',mandatory=False)
-    autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")
+    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)
 
-    if Options.options.wiimote:
-        conf.check_cc (header_name='cwiid.h', define_name='HAVE_CWIID_H')
-        if not conf.is_defined('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.is_defined('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.recurse('control_protocol')
     bld.recurse('generic_midi')
+    bld.recurse('faderport')
     bld.recurse('mackie')
+
     if bld.is_defined ('HAVE_LO'):
         bld.recurse('osc')
-    if bld.is_defined('BUILD_POWERMATE'):
-        bld.recurse('powermate')
     if bld.is_defined('BUILD_WIIMOTE'):
         bld.recurse('wiimote')
     if bld.is_defined('BUILD_TRANZPORT'):