diff options
| author | David Robillard <d@drobilla.net> | 2006-06-14 02:27:09 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-14 02:27:09 +0000 |
| commit | a8f44b1556e68f4cf28bd52e6de7359581a1ec45 (patch) | |
| tree | ca36a1ffe1b83860ccffb68b0054156c785a987f /SConstruct | |
| parent | 868f557f2612903f72614a2b3a317c7a528188d1 (diff) | |
(Messy merge fixes)
- (Re) added Jack MIDI configure stuff to build script
- Fixed MIDI initialization (pass Jack client to MIDI::Manager)
git-svn-id: svn://localhost/ardour2/branches/midi@582 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 6213ec85f4..116cc24275 100644 --- a/SConstruct +++ b/SConstruct @@ -462,18 +462,25 @@ libraries['dmalloc'] = conf.Finish () # conf = Configure(env) - -if conf.CheckCHeader('alsa/asoundlib.h'): +if conf.CheckCHeader('jack/midiport.h'): + libraries['sysmidi'] = LibraryInfo (LIBS='jack') + env['SYSMIDI'] = 'JACK MIDI' + subst_dict['%MIDITAG%'] = "control" + subst_dict['%MIDITYPE%'] = "jack" + print "Using JACK MIDI" +elif conf.CheckCHeader('alsa/asoundlib.h'): libraries['sysmidi'] = LibraryInfo (LIBS='asound') env['SYSMIDI'] = 'ALSA Sequencer' subst_dict['%MIDITAG%'] = "seq" subst_dict['%MIDITYPE%'] = "alsa/sequencer" + print "Using ALSA MIDI" elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'): # this line is needed because scons can't handle -framework in ParseConfig() yet. libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load') env['SYSMIDI'] = 'CoreMIDI' subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" + print "Using CoreMIDI" else: print "It appears you don't have the required MIDI libraries installed." sys.exit (1) |