diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-03 11:51:25 -0500 |
commit | 8648a8a13b04549362f14a0738947d997ef1abc7 (patch) | |
tree | 702652b49789b13d647c4c93df985f65361a4118 /libs/midi++2/wscript | |
parent | c428ec14b923928690492cab0428f8fad45f7658 (diff) | |
parent | ae6b0b9f1ab02ab949eaf741b98e69bdab487e92 (diff) |
fix up wscript/build issues in exportvis after merge with master
Diffstat (limited to 'libs/midi++2/wscript')
-rw-r--r-- | libs/midi++2/wscript | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index c05075a5f1..a42d909e65 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -50,7 +50,6 @@ def configure(conf): 'midipp', MAJOR, MINOR, MICRO, 'LIBMIDIPP_API', 'midi++/libmidi_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.118.2') autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') @@ -67,7 +66,7 @@ def build(bld): obj.cflags = [ '-fvisibility=hidden' ] else: obj = bld.stlib(features = 'cxx cxxstlib', source=libmidi_sources) - obj.cxxflags = [ '-fPIC', '-DWITH_JACK_MIDI' ] + obj.cxxflags = [ '-fPIC' ] obj.defines = [] # everybody loves JACK @@ -75,8 +74,8 @@ def build(bld): obj.includes = ['.', '../surfaces/control_protocol', '../ardour' ] obj.name = 'libmidipp' obj.target = 'midipp' - obj.uselib = 'GLIBMM SIGCPP XML JACK OSX' - obj.use = 'libpbd libevoral timecode' + obj.uselib = 'GLIBMM SIGCPP XML OSX' + obj.use = 'libpbd libevoral libtimecode libtimecode_includes' obj.vnum = LIBMIDIPP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') |