X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fwscript;h=5f0bb1aa2d6454675cc602a7f7a46f61cd7914ec;hb=b9ff443085b0513d95c867cce81595b9509b2dff;hp=f091acb148a7d6058e7df081968606afc9dbc7bf;hpb=ba8a593c294456e0b6e033e39d22eccd0548f7b5;p=ardour.git

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index f091acb148..5f0bb1aa2d 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 
 # Library version (UNIX style major, minor, micro)
@@ -9,45 +9,46 @@ import os
 LIBARDOUR_MCP_LIB_VERSION = '4.1.0'
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
     autowaf.configure(conf)
 
 def build(bld):
-    obj = bld.new_task_gen('cxx', 'shlib')
+    obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
-            bcf_surface.cc
-            bcf_surface_generated.cc
+            button.cc
             controls.cc
-            dummy_port.cc
+            device_info.cc
+            device_profile.cc
+            fader.cc
             gui.cc
             interface.cc
-            mackie_button_handler.cc
+            jog.cc
+            led.cc
             mackie_control_protocol.cc
-            mackie_control_protocol_poll.cc
             mackie_jog_wheel.cc
-            mackie_midi_builder.cc
-            mackie_port.cc
-            mackie_surface.cc
-            mackie_surface_generated.cc
+            mcp_buttons.cc
+            meter.cc
             midi_byte_array.cc
-            route_signal.cc
+            pot.cc
+            strip.cc
             surface.cc
             surface_port.cc
             types.cc
     '''
-    obj.export_incdirs = ['./mackie']
+    obj.export_includes = ['./mackie']
     obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
-    obj.includes     = ['.', './mackie']
+    # need ../libs because some GTK2 header files require stuff there
+    obj.includes     = ['.', '../libs']
     obj.name         = 'libardour_mcp'
     obj.target       = 'ardour_mcp'
     obj.uselib       = 'GTKMM'
-    obj.uselib_local = 'libardour libardour_cp libgtkmm2ext'
+    obj.use          = 'libardour libardour_cp libgtkmm2ext'
     obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')