Mercurial > hg > silvet

changeset 308:26be240475b5 livemode

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update bqvec paths
author Chris Cannam
date Mon, 19 Jan 2015 09:33:35 +0000
parents 5a181a427ac8
children f98ba4f47e49 447ccdbfc6c0
files .hgsubstate Makefile.inc src/EM.cpp
diffstat 3 files changed, 20 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Dec 05 17:00:06 2014 +0000
+++ b/.hgsubstate	Mon Jan 19 09:33:35 2015 +0000
@@ -1,3 +1,3 @@
-21267880e3c562aa3f93ce3b4ea19a945b445b5f bqvec
+352579430f81c79a550741a97bb1f96fea05da75 bqvec
 4aa3d343f5fcc21c821c0f2f633980da2d8fc8bd constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- a/Makefile.inc	Fri Dec 05 17:00:06 2014 +0000
+++ b/Makefile.inc	Mon Jan 19 09:33:35 2015 +0000
@@ -4,7 +4,7 @@
 VAMPSDK_DIR  ?= ../vamp-plugin-sdk
 
 CQ_DIR	     ?= constant-q-cpp
-BQVEC_DIR    ?= bqvec/src
+BQVEC_DIR    ?= bqvec
 FD_DIR	     ?= flattendynamics
 
 PLUGIN_EXT	?= .so
@@ -23,8 +23,8 @@
 PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h $(SRC_DIR)/Instruments.h $(SRC_DIR)/LiveInstruments.h
 PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/Instruments.cpp $(SRC_DIR)/LiveInstruments.cpp $(SRC_DIR)/libmain.cpp
 
-BQVEC_HEADERS	:= $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h
-BQVEC_SOURCES	:= $(BQVEC_DIR)/Allocators.cpp
+BQVEC_HEADERS	:= $(BQVEC_DIR)/bqvec/Allocators.h $(BQVEC_DIR)/bqvec/Restrict.h $(BQVEC_DIR)/bqvec/VectorOps.h
+BQVEC_SOURCES	:= $(BQVEC_DIR)/src/Allocators.cpp
 
 FD_HEADERS	:= $(FD_DIR)/flattendynamics-ladspa.h
 FD_SOURCES	:= $(FD_DIR)/flattendynamics-ladspa.cpp
@@ -58,8 +58,7 @@
 # DO NOT DELETE
 
 src/Silvet.o: src/Silvet.h src/MedianFilter.h src/Instruments.h src/EM.h
-src/Silvet.o: constant-q-cpp/src/dsp/Resampler.h
-src/Silvet.o: flattendynamics/flattendynamics-ladspa.h
+src/Silvet.o: constant-q-cpp/src/dsp/Resampler.h src/LiveInstruments.h
 src/EM.o: src/EM.h src/Instruments.h
 src/Instruments.o: src/Instruments.h data/include/templates.h
 src/Instruments.o: data/include/bassoon.h data/include/cello.h
@@ -69,10 +68,18 @@
 src/Instruments.o: data/include/violin.h data/include/viola.h
 src/Instruments.o: data/include/piano1.h data/include/piano2.h
 src/Instruments.o: data/include/piano3.h data/include/pianorwc.h
+src/LiveInstruments.o: src/LiveInstruments.h src/Instruments.h
+src/LiveInstruments.o: data/include/templates.h data/include/bassoon.h
+src/LiveInstruments.o: data/include/cello.h data/include/clarinet.h
+src/LiveInstruments.o: data/include/flute.h data/include/guitar.h
+src/LiveInstruments.o: data/include/horn.h data/include/oboe.h
+src/LiveInstruments.o: data/include/tenorsax.h data/include/violin.h
+src/LiveInstruments.o: data/include/viola.h data/include/piano1.h
+src/LiveInstruments.o: data/include/piano2.h data/include/piano3.h
+src/LiveInstruments.o: data/include/pianorwc.h
 src/libmain.o: src/Silvet.h src/MedianFilter.h src/Instruments.h
-bqvec/src/Allocators.o: bqvec/src/Allocators.h bqvec/src/VectorOps.h
-bqvec/src/Allocators.o: bqvec/src/Restrict.h
 flattendynamics/flattendynamics-ladspa.o: flattendynamics/flattendynamics-ladspa.h
 src/Silvet.o: src/MedianFilter.h src/Instruments.h
-bqvec/src/Allocators.o: bqvec/src/VectorOps.h bqvec/src/Restrict.h
-bqvec/src/VectorOps.o: bqvec/src/Restrict.h
+src/LiveInstruments.o: src/Instruments.h
+bqvec/bqvec/Allocators.o: bqvec/bqvec/VectorOps.h bqvec/bqvec/Restrict.h
+bqvec/bqvec/VectorOps.o: bqvec/bqvec/Restrict.h
--- a/src/EM.cpp	Fri Dec 05 17:00:06 2014 +0000
+++ b/src/EM.cpp	Mon Jan 19 09:33:35 2015 +0000
@@ -20,8 +20,9 @@
 
 #include <iostream>
 
-#include "VectorOps.h"
-#include "Allocators.h"
+#include "bqvec/VectorOps.h"
+#include "bqvec/Allocators.h"
+
 #include "Instruments.h"
 
 using std::vector;