Mercurial > hg > silvet

changeset 310:37d2d04d94db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update subrepo code
author Chris Cannam
date Tue, 28 Apr 2015 09:17:12 +0100
parents 07ee4ebea57c
children 99af9557dfc1
files .hgsubstate Makefile.inc src/EM.cpp
diffstat 3 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Jan 19 11:23:07 2015 +0000
+++ b/.hgsubstate	Tue Apr 28 09:17:12 2015 +0100
@@ -1,3 +1,3 @@
-21267880e3c562aa3f93ce3b4ea19a945b445b5f bqvec
-4aa3d343f5fcc21c821c0f2f633980da2d8fc8bd constant-q-cpp
+7a48704e9a0fac1486240f9f7b7e31436a588064 bqvec
+9106fb546452ef75de41a1ab8d97cc54ab763b5c constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- a/Makefile.inc	Mon Jan 19 11:23:07 2015 +0000
+++ b/Makefile.inc	Tue Apr 28 09:17:12 2015 +0100
@@ -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
@@ -13,7 +13,7 @@
 CC	?= gcc
 
 CFLAGS := $(CFLAGS)
-CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(CQ_DIR) -I$(BQVEC_DIR) -I$(FD_DIR) $(CXXFLAGS)
+CXXFLAGS := $(CFLAGS) -I. -I$(VAMPSDK_DIR) -I$(CQ_DIR) -I$(BQVEC_DIR) -I$(BQVEC_DIR) -I$(FD_DIR) $(CXXFLAGS)
 
 LDFLAGS := $(LDFLAGS) 
 PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS)
@@ -24,7 +24,7 @@
 PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/Instruments.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_SOURCES	:= $(BQVEC_DIR)/src/Allocators.cpp
 
 FD_HEADERS	:= $(FD_DIR)/flattendynamics-ladspa.h
 FD_SOURCES	:= $(FD_DIR)/flattendynamics-ladspa.cpp
@@ -59,7 +59,6 @@
 
 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/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
@@ -70,9 +69,5 @@
 src/Instruments.o: data/include/piano1.h data/include/piano2.h
 src/Instruments.o: data/include/piano3.h 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
--- a/src/EM.cpp	Mon Jan 19 11:23:07 2015 +0000
+++ b/src/EM.cpp	Tue Apr 28 09:17:12 2015 +0100
@@ -20,8 +20,8 @@
 
 #include <iostream>
 
-#include "VectorOps.h"
-#include "Allocators.h"
+#include "bqvec/VectorOps.h"
+#include "bqvec/Allocators.h"
 #include "Instruments.h"
 
 using std::vector;