diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-09 20:05:18 +0000 |
commit | 498dfebcca3b97cdd7b83444040042fe06626241 (patch) | |
tree | 09b397ba40679e67a1a265e6d227e39ee0b4b4da /libs/midi++2/wscript | |
parent | 8f508460903ef628a3f34ee60611b75ed4e1a734 (diff) |
90% done with external sync design changes (GUI now has toggle switch for ext/int sync; source chosen separately, currently in ardour prefs dialog ; fix libmidi++ and compilation scripts to correctly build JACK+ALSA support; minor contiuing tweaks on transport stuff
git-svn-id: svn://localhost/ardour2/branches/3.0@6048 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/wscript')
-rw-r--r-- | libs/midi++2/wscript | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index 14974581a9..735d513179 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -1,6 +1,7 @@ #!/usr/bin/env python import autowaf import os +import sys # Version of this package (even if built as a child) MAJOR = '2' @@ -36,10 +37,6 @@ def configure(conf): autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') - # TODO - conf.env['SYSMIDI'] = 'JACK MIDI' - conf.env.append_value('CXXFLAGS', '-DWITH_JACK_MIDI') - # Boost headers autowaf.check_header(conf, 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'boost/weak_ptr.hpp') @@ -61,12 +58,17 @@ def build(bld): mtc.cc version.cc ''' - if bld.env['SYSMIDI'] == 'JACK MIDI': - obj.source += ' jack_midiport.cc ' - elif bld.env['SYSMIDI'] == 'Alsa Sequencer': - obj.source += ' alsa_sequencer_midiport.cc ' - elif bld.env['SYSMIDI'] == 'CoreMIDI': + # everybody loves JACK + obj.source += ' jack_midiport.cc ' + obj.cxxflags = [ '-DWITH_JACK_MIDI' ] + if sys.platform == 'darwin': + # OS X obj.source += ' coremidi_midiport.cc ' + obj.cxxflags += [ '-DWITH_COREMIDI' ] + else : + # linux + obj.source += ' alsa_sequencer_midiport.cc ' + obj.cxxflags += [ '-DWITH_ALSA' ] obj.export_incdirs = ['.'] obj.includes = ['.'] obj.name = 'libmidipp' |