virtual Fill:: and Outline:: methods so that Canvas::Items that cache image rendering...

[ardour.git] / libs / surfaces / wscript

diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 8bd59f5daf53e578f1fa8c730e8504ed51f2d7e5..20ad07d60f134d5535e7e7c4d380772adba4c8f7 100644 (file)
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -44,30 +44,29 @@ def 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 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)
 
-    #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',mandatory=False)
-    conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC',mandatory=False)
+    autowaf.check_pkg (conf, 'liblo', mandatory=False, uselib_store="LO", atleast_version="0.24")
 
-    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)
+    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)
+        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')
 
 def build(bld):
     bld.recurse('control_protocol')
     bld.recurse('generic_midi')
     bld.recurse('mackie')
-    if bld.is_defined ('BUILD_OSC'):
+    if bld.is_defined ('HAVE_LO'):
         bld.recurse('osc')
     if bld.is_defined('BUILD_POWERMATE'):
         bld.recurse('powermate')