X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fwscript;h=0e34356de15e9723e7242366b0f11bfcf8fdd86b;hb=b61146365f827fd04fe54a79e0c08926c9e2e9b5;hp=20ad07d60f134d5535e7e7c4d380772adba4c8f7;hpb=02092679808718c993e741f7328a33888ddc294c;p=ardour.git

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 20ad07d60f..0e34356de1 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -21,13 +21,11 @@ out = 'build'
 
 children = [
         'control_protocol',
-        'frontier',
+        'faderport',
+        'faderport8',
+        'cc121',
         'generic_midi',
         'mackie',
-        'osc',
-        'powermate',
-        'tranzport',
-        'wiimote'
 ]
 
 def options(opt):
@@ -38,42 +36,58 @@ 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)
+    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)
 
-    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")
+    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')
-            conf.define ('BUILD_WIIMOTE', 1)
+            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)
+
+
 def build(bld):
     bld.recurse('control_protocol')
     bld.recurse('generic_midi')
+    bld.recurse('faderport')
+    bld.recurse('faderport8')
+    bld.recurse('cc121')
     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'):
         bld.recurse('tranzport')
+    if bld.is_defined('HAVE_USB'):
+        bld.recurse('push2')
 
 def shutdown():
     autowaf.shutdown()