# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1478804413 0
# Node ID 6990ca4ee720a23a7bd5dca70eab673750317e2e
# Parent  9693e8f1b47b338436765e2b10da6a827f8aebfb
Add MATCH build, and update INCPATH -> INCLUDES

diff -r 9693e8f1b47b -r 6990ca4ee720 .hgignore
--- a/.hgignore	Thu Nov 10 17:43:03 2016 +0000
+++ b/.hgignore	Thu Nov 10 19:00:13 2016 +0000
@@ -1,2 +1,4 @@
 syntax: glob
 *.o
+*~
+*.js
diff -r 9693e8f1b47b -r 6990ca4ee720 match-vamp-plugin/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/match-vamp-plugin/Makefile	Thu Nov 10 19:00:13 2016 +0000
@@ -0,0 +1,17 @@
+
+PIPER_VAMP_JS_DIR	:= ../../piper-vamp-js
+MATCH_VAMP_DIR		:= ../../match-vamp
+
+MODULE_NAME	:= MatchVampPlugin
+
+SRC_DIR		:= $(MATCH_VAMP_DIR)/src
+
+PLUGIN_SOURCES	:= $(wildcard $(SRC_DIR)/*.cpp)
+
+INCLUDES	:= -I$(SRC_DIR)
+DEFINES		:= -DUSE_COMPACT_TYPES
+EMFLAGS		:= -s TOTAL_MEMORY=100000000
+
+MODULE_SOURCE	:= match-vamp-plugin.cpp
+
+include $(PIPER_VAMP_JS_DIR)/Makefile.inc
diff -r 9693e8f1b47b -r 6990ca4ee720 match-vamp-plugin/match-vamp-plugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/match-vamp-plugin/match-vamp-plugin.cpp	Thu Nov 10 19:00:13 2016 +0000
@@ -0,0 +1,10 @@
+
+#include "PiperExport.h"
+#include "MatchVampPlugin.h"
+
+std::string soname("match-vamp-plugin");
+piper_vamp_js::PiperAdapter<MatchVampPlugin> adapter(soname);
+piper_vamp_js::PiperPluginLibrary library({ &adapter });
+
+PIPER_EXPORT_LIBRARY(library);
+
diff -r 9693e8f1b47b -r 6990ca4ee720 qm-vamp-plugins/Makefile
--- a/qm-vamp-plugins/Makefile	Thu Nov 10 17:43:03 2016 +0000
+++ b/qm-vamp-plugins/Makefile	Thu Nov 10 19:00:13 2016 +0000
@@ -8,7 +8,7 @@
 DSP	:= $(QMV)/qm-dsp
 EXT	:= $(DSP)/ext
 
-INCPATH	:= -I$(QMV) -I$(DSP) -I$(EXT)/kissfft -I$(EXT)/kissfft/tools
+INCLUDES	:= -I$(QMV) -I$(DSP) -I$(EXT)/kissfft -I$(EXT)/kissfft/tools
 DEFINES := -DNO_BLAS_WRAP -DADD_ -Dkiss_fft_scalar=double -I$(EXT)/clapack/include -I$(EXT)/cblas/include
 
 CLAPACK_SOURCES := \
diff -r 9693e8f1b47b -r 6990ca4ee720 silvet/Makefile
--- a/silvet/Makefile	Thu Nov 10 17:43:03 2016 +0000
+++ b/silvet/Makefile	Thu Nov 10 19:00:13 2016 +0000
@@ -11,12 +11,12 @@
 BQVEC_DIR     	:= $(SILVET_DIR)/bqvec
 FD_DIR	     	:= $(SILVET_DIR)/flattendynamics
 
-INCPATH		:= -I$(SRC_DIR) -I$(CQ_DIR) -I$(CQ_DIR)/cq -I$(KFFT_DIR) -I$(KFFT_DIR)/tools -I$(SILVET_DIR) -I$(FD_DIR) -I$(BQVEC_DIR)
+INCLUDES	:= -I$(SRC_DIR) -I$(CQ_DIR) -I$(CQ_DIR)/cq -I$(KFFT_DIR) -I$(KFFT_DIR)/tools -I$(SILVET_DIR) -I$(FD_DIR) -I$(BQVEC_DIR)
 
 EMFLAGS		:= -s TOTAL_MEMORY=100000000
 
 DEFINES		:= -Dkiss_fft_scalar=double
- 
+
 PLUGIN_SOURCES 	:= \
 		$(SRC_DIR)/Silvet.cpp \
 		$(SRC_DIR)/EM.cpp \