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 04b027b6a381b3821e782d690672db9418c569aa..95b64a0599f41f9e9ed74e30bca39d77db8a69d9 100644 (file)
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -6,8 +6,18 @@ import glob
 
 Import('env libraries install_prefix')
 
-midi2 = env.Copy()
-midi2.Merge([ libraries['sigc2'], libraries['xml'], 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")
 
 domain = 'midipp'
 
@@ -22,9 +32,9 @@ midifactory.cc
 midimanager.cc
 midiparser.cc
 midiport.cc
+midnam_patch.cc
 mmc.cc
 mtc.cc
-port_request.cc
 version.cc
 """)
 
@@ -57,7 +67,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
 
 Default(libmidi2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libmidi2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] + sources + sysdep_sources +