Mercurial > hg > silvet

changeset 144:5e9ad8b2d9b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include qm-dsp objects
author Chris Cannam
date Thu, 08 May 2014 18:12:14 +0100
parents fe3c902ccb90
children 450f9987f041
files Makefile.inc Makefile.linux
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.inc	Thu May 08 17:31:55 2014 +0100
+++ b/Makefile.inc	Thu May 08 18:12:14 2014 +0100
@@ -12,8 +12,8 @@
 CXX	?= g++
 CC	?= gcc
 
-CFLAGS := $(CFLAGS) 
-CXXFLAGS := -I. -I$(VAMPSDK_DIR) -I$(QMDSP_DIR) -I$(BQVEC_DIR) $(CXXFLAGS)
+CFLAGS := $(CFLAGS) -I$(QMDSP_DIR)/ext/kissfft -I$(QMDSP_DIR)/ext/kissfft/tools -Dkiss_fft_scalar=double
+CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(QMDSP_DIR) -I$(BQVEC_DIR) $(CXXFLAGS)
 
 LDFLAGS := $(LDFLAGS) 
 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
@@ -29,11 +29,15 @@
 BQVEC_HEADERS	:= $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h
 BQVEC_SOURCES	:= $(BQVEC_DIR)/Allocators.cpp
 
+QMDSP_HEADERS	:= 
+QMDSP_SOURCES	:= $(QMDSP_DIR)/dsp/rateconversion/Resampler.cpp $(QMDSP_DIR)/base/KaiserWindow.cpp $(QMDSP_DIR)/base/SincWindow.cpp $(QMDSP_DIR)/thread/Thread.cpp $(QMDSP_DIR)/dsp/transforms/FFT.cpp $(QMDSP_DIR)/maths/MathUtilities.cpp $(QMDSP_DIR)/ext/kissfft/kiss_fft.c $(QMDSP_DIR)/ext/kissfft/tools/kiss_fftr.c
+
 HEADERS	     := $(PLUGIN_HEADERS) $(CQ_HEADERS) $(BQVEC_HEADERS)
-SOURCES	     := $(PLUGIN_SOURCES) $(CQ_SOURCES) $(BQVEC_SOURCES)
+SOURCES	     := $(PLUGIN_SOURCES) $(CQ_SOURCES) $(BQVEC_SOURCES) $(QMDSP_SOURCES)
 OBJECTS	     := $(SOURCES:.cpp=.o)
+OBJECTS	     := $(OBJECTS:.c=.o)
 
-LIBS	:= $(QMDSP_DIR)/libqm-dsp.a $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread
+LIBS	:= $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread
 
 all: $(PLUGIN)
 
--- a/Makefile.linux	Thu May 08 17:31:55 2014 +0100
+++ b/Makefile.linux	Thu May 08 18:12:14 2014 +0100
@@ -1,12 +1,12 @@
 
-CFLAGS := -Wall -O3 -fopenmp -ffast-math -msse -mfpmath=sse -ftree-vectorize -fPIC -I../vamp-plugin-sdk/
+CFLAGS := -Wall -O3 -fopenmp -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC -I../vamp-plugin-sdk/ -DUSE_PTHREADS
 
 #CFLAGS := -g -fPIC -I../vamp-plugin-sdk
 
 CXXFLAGS := $(CFLAGS)
 
 VAMPSDK_DIR := ../vamp-plugin-sdk
-PLUGIN_LDFLAGS := -lgomp -shared -Wl,--version-script=vamp-plugin.map
+PLUGIN_LDFLAGS := -lgomp -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map
 
 PLUGIN_EXT := .so