X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fwscript;h=0c736733a12da7c8602752215b349128af6a6eb2;hb=485e31f08215d6f311e6ae6221d8d7a7c31d599c;hp=71bb35d6cc8f7d44b3978a5ac154ea2018ea39e2;hpb=59076a7e4c66db12bbbfbf01f012ca2f6ba4bf56;p=ardour.git

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 71bb35d6cc..0c736733a1 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -21,6 +21,7 @@ out = 'build'
 
 children = [
         'control_protocol',
+        'faderport',
         'generic_midi',
         'mackie',
 ]
@@ -37,11 +38,16 @@ def configure(conf):
 
     autowaf.set_recursive()
     autowaf.configure(conf)
-    
-    #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)
 
+    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' ]
 
@@ -67,6 +73,7 @@ def configure(conf):
 def build(bld):
     bld.recurse('control_protocol')
     bld.recurse('generic_midi')
+    bld.recurse('faderport')
     bld.recurse('mackie')
 
     if bld.is_defined ('HAVE_LO'):
@@ -75,6 +82,8 @@ def build(bld):
         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()