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 7c3267a6c7d6728ab6d62711839a0bff707a0332..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['pbd3'] ])
+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'
 
@@ -18,41 +28,46 @@ fd_midiport.cc
 fifomidi.cc
 midi.cc
 midichannel.cc
-midicontrollable.cc
 midifactory.cc
 midimanager.cc
 midiparser.cc
 midiport.cc
+midnam_patch.cc
 mmc.cc
 mtc.cc
-port_request.cc
 version.cc
 """)
 
 sysdep_sources = Split ("""
+jack_midiport.cc
 alsa_sequencer_midiport.cc
 coremidi_midiport.cc
 """)
 
-if env['SYSMIDI'] == 'CoreMIDI':
+if env['SYSMIDI'] == 'JACK MIDI':
+   sysdep_src = [ 'jack_midiport.cc' ]
+   midi2.Append (CCFLAGS="-DWITH_JACK_MIDI")
+elif env['SYSMIDI'] == 'ALSA Sequencer':
+   sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
+   midi2.Append (CCFLAGS="-DWITH_ALSA")
+elif env['SYSMIDI'] == 'CoreMIDI':
    sysdep_src = [ 'coremidi_midiport.cc' ]
    midi2.Append (CCFLAGS="-DWITH_COREMIDI")
    midi2.Append (LINKFLAGS="-framework CoreMIDI")
    midi2.Append (LINKFLAGS="-framework CoreFoundation")
-else:
-   sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
-   midi2.Append (CCFLAGS="-DWITH_ALSA")
+
+
 
 midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 
-midi2.VersionBuild(['version.cc','midi++/version.h'], 'SConscript')
+midi2.VersionBuild(['version.cc','midi++/version.h'],  [])
 
 libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
 
 Default(libmidi2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/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 +