Mercurial > hg > silvet

changeset 143:fe3c902ccb90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add qm-dsp as subrepo
author Chris Cannam
date Thu, 08 May 2014 17:31:55 +0100
parents 03fbd6a204fd
children 5e9ad8b2d9b1
files .hgsub .hgsubstate Makefile.inc
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Thu May 08 14:39:41 2014 +0100
+++ b/.hgsub	Thu May 08 17:31:55 2014 +0100
@@ -1,2 +1,3 @@
 constant-q-cpp = https://code.soundsoftware.ac.uk/hg/constant-q-cpp
 bqvec = https://bitbucket.org/breakfastquay/bqvec
+qm-dsp = https://code.soundsoftware.ac.uk/hg/qm-dsp
--- a/.hgsubstate	Thu May 08 14:39:41 2014 +0100
+++ b/.hgsubstate	Thu May 08 17:31:55 2014 +0100
@@ -1,2 +1,3 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
 4cb16296f14156f59bc6c716fb67767f53d67028 constant-q-cpp
+783fb5f0e626d9bf2b3ad53d84187dadbdb8f56e qm-dsp
--- a/Makefile.inc	Thu May 08 14:39:41 2014 +0100
+++ b/Makefile.inc	Thu May 08 17:31:55 2014 +0100
@@ -1,11 +1,11 @@
 
 SRC_DIR  := src
 
-QMDSP_DIR ?= ../qm-dsp
 VAMPSDK_DIR  ?= ../vamp-plugin-sdk
 
 CQ_DIR	     ?= constant-q-cpp/cpp-qm-dsp
 BQVEC_DIR    ?= bqvec/src
+QMDSP_DIR    ?= qm-dsp
 
 PLUGIN_EXT	?= .so
 
@@ -20,8 +20,8 @@
 
 PLUGIN	:= silvet$(PLUGIN_EXT)
 
-VAMP_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h
-VAMP_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/libmain.cpp
+PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h
+PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/libmain.cpp
 
 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
@@ -29,8 +29,8 @@
 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)
+HEADERS	     := $(PLUGIN_HEADERS) $(CQ_HEADERS) $(BQVEC_HEADERS)
+SOURCES	     := $(PLUGIN_SOURCES) $(CQ_SOURCES) $(BQVEC_SOURCES)
 OBJECTS	     := $(SOURCES:.cpp=.o)
 
 LIBS	:= $(QMDSP_DIR)/libqm-dsp.a $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread