aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Bullock <jamie@jamiebullock.com>2013-01-07 18:14:34 +0000
committerJamie Bullock <jamie@jamiebullock.com>2013-01-07 18:14:34 +0000
commitef3f6c2009fba2f3d3c79c26f631ea3a34f75aa5 (patch)
tree8c519416e0407b7d0a32816204063e19db6f8cb7
parent5f1f44cdf4eee73e796e6bc7b59892fc6041b444 (diff)
downloadLibXtract-ef3f6c2009fba2f3d3c79c26f631ea3a34f75aa5.tar.gz
LibXtract-ef3f6c2009fba2f3d3c79c26f631ea3a34f75aa5.tar.bz2
LibXtract-ef3f6c2009fba2f3d3c79c26f631ea3a34f75aa5.zip
removed references to FFTW
-rw-r--r--README.md7
-rw-r--r--examples/MSP/Makefile3
-rw-r--r--src/xtract_macros_private.h1
3 files changed, 2 insertions, 9 deletions
diff --git a/README.md b/README.md
index 5b597af..baa8b51 100644
--- a/README.md
+++ b/README.md
@@ -16,10 +16,6 @@ The latest source code release for LibXtract can be downloaded from [https://git
## 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 you are installing from a GIT clone, first run:
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:
diff --git a/examples/MSP/Makefile b/examples/MSP/Makefile
index 0bcaa8f..bb3fbb4 100644
--- a/examples/MSP/Makefile
+++ b/examples/MSP/Makefile
@@ -9,7 +9,6 @@ MAXINCLUDE = $(FRAMEWORKS)/MaxAPI.framework/Headers
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 @@ CFLAGS = -F$(FRAMEWORKS) -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -x
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
diff --git a/src/xtract_macros_private.h b/src/xtract_macros_private.h
index 3417175..75903d0 100644
--- a/src/xtract_macros_private.h
+++ b/src/xtract_macros_private.h
@@ -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