summaryrefslogtreecommitdiff
path: root/libs/midi++2
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-10-18 11:11:59 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-10-18 11:11:59 -0400
commit683496c501641fb5d7d47bdf9064aed72755ca61 (patch)
treee0885ae9830422dd09dec186a0aeac0c7f92c5fd /libs/midi++2
parent6da4ad80bec30933ea85750e4cb39a9f4e86f465 (diff)
use libltc and libtimecode as static libs, and upgrade to waf 1.7
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change just moves the linkage point to another location. Also fix a bug with the libardour version tha was picked up by waf 1.7
Diffstat (limited to 'libs/midi++2')
-rw-r--r--libs/midi++2/wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index e27c4876ee..39a4411dc0 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -77,7 +77,7 @@ def build(bld):
obj.name = 'libmidipp'
obj.target = 'midipp'
obj.uselib = 'GLIBMM SIGCPP XML JACK OSX'
- obj.use = 'libpbd libevoral libtimecode'
+ obj.use = 'libpbd libevoral timecode_includes'
obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')