summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/wscript5
-rw-r--r--libs/ardour/wscript4
-rw-r--r--libs/midi++2/wscript2
-rw-r--r--libs/surfaces/control_protocol/wscript2
-rwxr-xr-xwafbin94860 -> 97994 bytes
5 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ebc28ebf8f..cc494c2ba2 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -434,7 +434,10 @@ def build(bld):
'ardour',
'libardour_cp',
'libgtkmm2ext',
- 'libtaglib' ]
+ 'libtaglib',
+ 'timecode_includes'
+ ]
+
if sys.platform == 'darwin':
obj.use += ' libappleutility'
obj.defines += [
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 6fec6ae9d0..838e72279c 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -317,7 +317,7 @@ def build(bld):
# major increment <=> incompatible changes
# minor increment <=> compatible changes (additions)
# micro increment <=> no interface changes
- LIBARDOUR_LIB_VERSION = "3.0.0."
+ LIBARDOUR_LIB_VERSION = "3.0.0"
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
@@ -343,7 +343,7 @@ def build(bld):
'OSX','BOOST','CURL','DL']
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
'libvampplugin','libtaglib','librubberband',
- 'libaudiographer','libltc','libtimecode']
+ 'libaudiographer', 'ltc', 'timecode' ]
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.defines += [
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')
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index e1e1af950c..a597ca9e2a 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -43,7 +43,7 @@ def build(bld):
obj.includes = ['.', './control_protocol']
obj.name = 'libardour_cp'
obj.target = 'ardourcp'
- obj.use = 'ardour libtimecode'
+ obj.use = 'ardour'
obj.vnum = LIBARDOUR_CP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
diff --git a/waf b/waf
index 6780539c8e..9d2582a24a 100755
--- a/waf
+++ b/waf
Binary files differ