add back the SConscript file

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2776 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/rubberband/SConscript b/libs/rubberband/SConscript
new file mode 100644 (file)
index 0000000..2706c97
--- /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 8347e098057fa493ae0652568832ed64ec2bdf21..4df10256594ba0ef14ef04ea5a0c9c8cf6449c01 100644 (file)
--- 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
 {