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 c23b3cf3c957f252e5e1b07106db70e16330ceb5..4fcbe6fde369b49f2bc4f0ae8f3dfd9629739949 100644 (file)
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -34,11 +34,12 @@ def build(bld):
             midicontrollable.cc
     '''
     obj.export_includes = ['./generic_midi']
-    obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
+    obj.defines      = [ 'PACKAGE="ardour_frontier"' ]
+    obj.defines     += [ 'ARDOURSURFACE_DLL_EXPORTS' ]
     obj.includes     = ['.', './generic_midi']
     obj.name         = 'libgeneric_midi'
     obj.target       = 'generic_midi'
-    obj.use          = 'libardour libsurfaces'
+    obj.use          = 'libardour libardourcp'
     obj.vnum         = LIBSURFACES_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')