1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 4d56983..41dd54a 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -287,7 +287,8 @@ def configure(conf):
# we don't try to detect this, since its part of our source tree
- conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
+ autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
+ autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it
conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
@@ -332,7 +333,7 @@ def build(bld):
obj.target = 'ardour'
obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
- 'OSX','BOOST','CURL','DL']
+ 'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
'libvampplugin','libtaglib','librubberband',
'libaudiographer','libltc','libtimecode']
diff --git a/wscript b/wscript
index 3d01632..e84f4bf 100644
--- a/wscript
+++ b/wscript
@@ -24,9 +24,7 @@ children = [
'libs/vamp-sdk',
'libs/qm-dsp',
'libs/vamp-plugins',
- 'libs/taglib',
'libs/libltc',
- 'libs/rubberband',
'libs/surfaces',
'libs/panners',
'libs/backends',
|
GitWeb
