merge with master, with minor conflict fixes

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

diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index ac8341c64d8023f2d8224e8b6e5fc2e29c1e260f..4fcbe6fde369b49f2bc4f0ae8f3dfd9629739949 100644 (file)
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -34,7 +34,8 @@ def build(bld):
             midicontrollable.cc
     '''
     obj.export_includes = ['./generic_midi']
-    obj.defines     = [ 'PACKAGE="ardour_frontier"' ]
+    obj.defines      = [ 'PACKAGE="ardour_frontier"' ]
+    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './generic_midi']
     obj.name         = 'libgeneric_midi'
     obj.target       = 'generic_midi'