changeset 143:09599ca5a02a

removed references to FFTW
author Jamie Bullock <jamie@jamiebullock.com>
date Mon, 07 Jan 2013 18:14:34 +0000
parents 117f42bd3ece
children 7fbca00c2c05
files README.md examples/MSP/Makefile src/xtract_macros_private.h
diffstat 3 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Mon Jan 07 17:03:10 2013 +0000
+++ b/README.md	Mon Jan 07 18:14:34 2013 +0000
@@ -16,10 +16,6 @@
 
 ## Dependencies
 
-To compile LibXtract from the source code release, the following optional software is also needed:
-
-    fftw3 (compiled with floating-point support)
-
 To build the PD external, the PD header 'm_pd.h' is required, this can be found in the [Pure Data source code release](http://puredata.info/downloads/pure-data).
 
 If you are compiling LibXtract from a GIT clone, the **autotools** build system is required. This includes:
@@ -36,14 +32,13 @@
 
 If autogen.sh was successful, or you downloaded the source release, type:
 
-    ./configure --enable-pd_example --enable-fft
+    ./configure --enable-pd_example
     make
     sudo make install
 
 There following configure flags are optional:
 
     --enable-pd_example (to build the PD example)
-    --enable-fft (to enable functions that require fftw3)
     --enable-simpletest (to build the simpletest example)
 
 If you wish to build a Universal binary on OS X, you may need to do something like this:
--- a/examples/MSP/Makefile	Mon Jan 07 17:03:10 2013 +0000
+++ b/examples/MSP/Makefile	Mon Jan 07 18:14:34 2013 +0000
@@ -9,7 +9,6 @@
 MSPINCLUDE = $(FRAMEWORKS)/MaxAudioAPI.framework/Headers
 INSTALLDIR = /Applications/Max5/Cycling\ \'74/externals/
 XTRACT_HEADERS = /usr/local/include
-FFTW_LIBS = -lfftw3f #include this if you compiled libxtract with --enable-fft
 
 LIPO = /usr/bin/lipo
 CC = gcc
@@ -21,7 +20,7 @@
 I386CFLAGS = -arch i386 
 IX86_64CFLAGS = -arch x86_64
 
-LDFLAGS = -F$(FRAMEWORKS) -L$(MAXINCLUDE) -L$(MSPINCLUDE) -framework Carbon -framework MaxAPI -framework MaxAudioAPI -Wl,-Y,1455 -bundle -L/usr/local/lib -lxtract $(FFTW_LIBS)
+LDFLAGS = -F$(FRAMEWORKS) -L$(MAXINCLUDE) -L$(MSPINCLUDE) -framework Carbon -framework MaxAPI -framework MaxAudioAPI -Wl,-Y,1455 -bundle -L/usr/local/lib -lxtract
 
 I386LDFLAGS = -arch i386
 IX86_64CFLAGS = -arch x86_64
--- a/src/xtract_macros_private.h	Mon Jan 07 17:03:10 2013 +0000
+++ b/src/xtract_macros_private.h	Mon Jan 07 18:14:34 2013 +0000
@@ -31,7 +31,6 @@
 #define XTRACT_SQ(a) ((a) * (a))
 #define XTRACT_MIN(a, b) ((a) < (b) ? (a) : (b))
 #define XTRACT_MAX(a, b) ((a) > (b) ? (a) : (b))
-#define XTRACT_NEEDS_FFTW printf("LibXtract must be compiled with fftw support to use this function.\n")
 #define XTRACT_VERY_SMALL_NUMBER 2e-42
 #define XTRACT_LOG_LIMIT XTRACT_VERY_SMALL_NUMBER
 #define XTRACT_LOG_LIMIT_DB -96.0