diff options
| author | David Robillard <d@drobilla.net> | 2009-02-26 01:22:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-26 01:22:20 +0000 |
| commit | 1d516ac95a61d12dadaaf75c46f792d8e4308578 (patch) | |
| tree | 4510f9d79575fd2f735c6740534e682132d9777b /libs/ardour | |
| parent | 03536cd399131e3fec54c95ae5ac6f11dca05aef (diff) | |
Waf building of rubberband.
Use rubberband over soundtouch with waf for the time being.
git-svn-id: svn://localhost/ardour2/branches/3.0@4669 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/rb_effect.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/wscript | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index b709c9bd1f..3cda2eb706 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -21,7 +21,7 @@ #include <cmath> #include "pbd/error.h" -#include <rubberband/RubberBandStretcher.h> +#include "rubberband/RubberBandStretcher.h" #include "ardour/types.h" #include "ardour/stretch.h" diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 564c611d63..3001d063d3 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -38,8 +38,9 @@ def configure(conf): autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE', atleast_version='0.1.0') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') - autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18') - autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH') + #autowaf.check_pkg(conf, 'soundtouch-1.0', uselib_store='SOUNDTOUCH') + + conf.env.append_value('CXXFLAGS', '-DUSE_RUBBERBAND') check_header_and_define(conf, 'sys/vfs.h', 'HAVE_SYS_VFS_H') check_header_and_define(conf, 'wordexp.h', 'HAVE_WORDEXP') @@ -215,8 +216,10 @@ def build(bld): os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"' obj.cxxflags += ' -DVAMP_DIR=\\\"' + os.path.join( os.path.normpath(bld.env['LIBDIRNAME']), 'ardour3', 'vamp') + '\\\"' - obj.source += ' st_stretch.cc st_pitch.cc ' - obj.uselib += ' SOUNDTOUCH ' + obj.source += ' rb_effect.cc ' + obj.uselib_local += ' librubberband ' + #obj.source += ' st_stretch.cc st_pitch.cc ' + #obj.uselib += ' SOUNDTOUCH ' def shutdown(): autowaf.shutdown() |