Mercurial > hg > qm-dsp

changeset 297:b74f91bd5c7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Build fixes for OS/X
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 02 Jun 2009 11:25:58 +0000
parents f6fb85073d64
children 255e431ae3d4
files dsp/transforms/kissfft/kiss_fft.h qm-dsp.pro
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dsp/transforms/kissfft/kiss_fft.h	Tue Jun 02 11:10:40 2009 +0000
+++ b/dsp/transforms/kissfft/kiss_fft.h	Tue Jun 02 11:25:58 2009 +0000
@@ -5,7 +5,11 @@
 #include <stdio.h>
 #include <math.h>
 #include <memory.h>
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
--- a/qm-dsp.pro	Tue Jun 02 11:10:40 2009 +0000
+++ b/qm-dsp.pro	Tue Jun 02 11:25:58 2009 +0000
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += warn_on staticlib release
+CONFIG += release warn_on staticlib
 CONFIG -= qt
 OBJECTS_DIR = tmp_obj
 MOC_DIR = tmp_moc
@@ -21,23 +21,14 @@
 }
 
 macx-g++* {
+    QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+    CONFIG += x86 ppc
+    QMAKE_CXXFLAGS_RELEASE += -O2 -g0 -fvisibility=hidden -I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/
+    INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/Headers/
     DEFINES += USE_PTHREADS
     QMAKE_CXXFLAGS_RELEASE += -fvisibility=hidden
 }
 
-#DEPENDPATH += base \
-#              dsp/chromagram \
-#              dsp/keydetection \
-#              dsp/maths \
-#              dsp/onsets \
-#              dsp/phasevocoder \
-#              dsp/rateconversion \
-#              dsp/signalconditioning \
-#              dsp/tempotracking \
-#              dsp/tonal \
-#              dsp/transforms
-
-#INCLUDEPATH += . include
 INCLUDEPATH += . 
 
 # Input