Mercurial > hg > silvet
changeset 126:f7e3c782d758 bqvec-openmp
bqvec as subrepo
| author | Chris Cannam |
|---|---|
| date | Wed, 07 May 2014 11:51:31 +0100 |
| parents | ab159c3bf1b8 |
| children | df05f855f63b 3fabb973c813 |
| files | .hgsub .hgsubstate Makefile.inc |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Wed May 07 11:18:30 2014 +0100 +++ b/.hgsub Wed May 07 11:51:31 2014 +0100 @@ -1,1 +1,2 @@ constant-q-cpp = https://code.soundsoftware.ac.uk/hg/constant-q-cpp +bqvec = https://bitbucket.org/breakfastquay/bqvec
--- a/.hgsubstate Wed May 07 11:18:30 2014 +0100 +++ b/.hgsubstate Wed May 07 11:51:31 2014 +0100 @@ -1,1 +1,2 @@ +f11c3c331979bbec59041e4a76401b50c0469a7d bqvec 7d97986563a0b3104a5c3f88190350ae55528738 constant-q-cpp
--- a/Makefile.inc Wed May 07 11:18:30 2014 +0100 +++ b/Makefile.inc Wed May 07 11:51:31 2014 +0100 @@ -3,9 +3,9 @@ QMDSP_DIR ?= ../qm-dsp VAMPSDK_DIR ?= ../vamp-plugin-sdk -BQVEC_DIR ?= ../bqvec CQ_DIR ?= constant-q-cpp/cpp-qm-dsp +BQVEC_DIR ?= bqvec/src PLUGIN_EXT ?= .so @@ -26,8 +26,11 @@ CQ_HEADERS := $(CQ_DIR)/CQKernel.h $(CQ_DIR)/ConstantQ.h $(CQ_DIR)/CQInterpolated.h CQ_SOURCES := $(CQ_DIR)/CQKernel.cpp $(CQ_DIR)/ConstantQ.cpp $(CQ_DIR)/CQInterpolated.cpp -HEADERS := $(VAMP_HEADERS) $(CQ_HEADERS) -SOURCES := $(VAMP_SOURCES) $(CQ_SOURCES) +BQVEC_HEADERS := $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h +BQVEC_SOURCES := $(BQVEC_DIR)/Allocators.cpp + +HEADERS := $(VAMP_HEADERS) $(CQ_HEADERS) $(BQVEC_HEADERS) +SOURCES := $(VAMP_SOURCES) $(CQ_SOURCES) $(BQVEC_SOURCES) OBJECTS := $(SOURCES:.cpp=.o) LIBS := $(QMDSP_DIR)/libqm-dsp.a $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread @@ -64,6 +67,10 @@ constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQInterpolated.h constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h +bqvec/src/Allocators.o: bqvec/src/Allocators.h bqvec/src/VectorOps.h +bqvec/src/Allocators.o: bqvec/src/Restrict.h constant-q-cpp/cpp-qm-dsp/ConstantQ.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/ConstantQ.h constant-q-cpp/cpp-qm-dsp/CQInterpolated.o: constant-q-cpp/cpp-qm-dsp/CQKernel.h +bqvec/src/Allocators.o: bqvec/src/VectorOps.h bqvec/src/Restrict.h +bqvec/src/VectorOps.o: bqvec/src/Restrict.h