X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2FSConscript;h=95b64a0599f41f9e9ed74e30bca39d77db8a69d9;hb=6bef95806ee50c917d9d73ea1520e0b7c573d793;hp=1a0f887459077b443b852f8d619166ca868af7f1;hpb=a9e38032a376df3c8a930457211813958f3ba73b;p=ardour.git

diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index 1a0f887459..95b64a0599 100644
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -1,11 +1,23 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
-Import('env libraries')
+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'
 
@@ -16,37 +28,47 @@ 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':
-   sysdep_src = [ 'coremidi_midiport.cc' ]
-   midi2.Append (CCFLAGS="-DWITH_COREMIDI")
-else:
+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")
+
+
 
 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 ])
 
-libmidi2 = midi2.StaticLibrary('midi++', [ sources, sysdep_src ])
 Default(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 +
                                      glob.glob('midi++/*.h')))