Merge branch 'master' into windows+cc

[ardour.git] / libs / surfaces / mackie / wscript

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index d874554352a17afdfcf05a91a5e5f9adb3eb7edc..e097772e7a46ec3536a781aedb112a14dce5a84a 100644 (file)
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -21,21 +21,21 @@ def configure(conf):
 def build(bld):
     obj = bld(features = 'cxx cxxshlib')
     obj.source = '''
-            bcf_surface.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
+            jog_wheel.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
+            mcp_buttons.cc
             meter.cc
             midi_byte_array.cc
-            route_signal.cc
+            pot.cc
             strip.cc
             surface.cc
             surface_port.cc
@@ -43,8 +43,10 @@ def build(bld):
     '''
     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.defines      = [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.target       = 'ardour_mcp'
     obj.uselib       = 'GTKMM'
     obj.use          = 'libardour libardour_cp libgtkmm2ext'