Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / midi++2 / SConscript

diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index 14c02823960d5b1abf51ac2713fd47fe30a95f20..95b64a0599f41f9e9ed74e30bca39d77db8a69d9 100644 (file)
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -6,8 +6,15 @@ import glob
 
 Import('env libraries install_prefix')
 
-midi2 = env.Copy()
-midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'], libraries['pbd'], libraries['jack'] ])
+midi2 = env.Clone()
+midi2.Merge([ libraries['sigc2'], 
+             libraries['xml'], 
+             libraries['evoral'], 
+             libraries['glibmm2'], 
+             libraries['glib2'], 
+             libraries['pbd'], 
+             libraries['jack'] 
+             ])
 
 if midi2['IS_OSX']:
        midi2.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
@@ -25,6 +32,7 @@ midifactory.cc
 midimanager.cc
 midiparser.cc
 midiport.cc
+midnam_patch.cc
 mmc.cc
 mtc.cc
 version.cc