diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-11 15:34:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-12-11 15:34:37 +0000 |
| commit | 5ccd39818073c7693723a50490fac846af017296 (patch) | |
| tree | 1a32607c40d0f382a1070b16f11f8da2ce048ecf /libs/rubberband | |
| parent | ea99cb0d6bd71623a0cc37ad524f6cbb18d28e87 (diff) | |
add back the SConscript file
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2776 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/rubberband')
| -rw-r--r-- | libs/rubberband/SConscript | 30 | ||||
| -rw-r--r-- | libs/rubberband/src/FFT.cpp | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/libs/rubberband/SConscript b/libs/rubberband/SConscript new file mode 100644 index 0000000000..2706c976fa --- /dev/null +++ b/libs/rubberband/SConscript @@ -0,0 +1,30 @@ +# -*- python -*- + +import os +import os.path +import glob + +rubberband_files = glob.glob ('src/*.cpp') + +Import('env install_prefix libraries') +rb = env.Copy() + +rb.Merge ([libraries['fftw3f'], + libraries['fftw3'], + libraries['vamp'], + libraries['samplerate'], + libraries['sndfile-ardour'] + ]) + +rb.Append (CPPATH='#libs/rubberband/rubberband', CXXFLAGS="-Ilibs/rubberband/rubberband") + +librb = rb.SharedLibrary('rubberband', rubberband_files) + +Default(librb) + +env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), librb)) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript'] + rubberband_files + glob.glob('src/*.h'))) + + diff --git a/libs/rubberband/src/FFT.cpp b/libs/rubberband/src/FFT.cpp index 8347e09805..4df1025659 100644 --- a/libs/rubberband/src/FFT.cpp +++ b/libs/rubberband/src/FFT.cpp @@ -74,6 +74,7 @@ public: #ifdef FFTW_DOUBLE_ONLY #ifdef FFTW_FLOAT_ONLY +#error Building for FFTW-DOUBLE BOTH // Can't meaningfully define both #undef FFTW_DOUBLE_ONLY #undef FFTW_FLOAT_ONLY @@ -91,6 +92,7 @@ public: #define cosf cos #define sinf sin #endif /* !FFTW_FLOAT_ONLY */ +#endif #ifdef FFTW_FLOAT_ONLY #define fftw_complex fftwf_complex @@ -475,7 +477,6 @@ D_FFTW::m_extantd = 0; Mutex D_FFTW::m_extantMutex; -#endif class D_Cross : public FFTImpl { |