diff Makefile.inc @ 342:ad45b18427e0

Merge from branch livemode
author Chris Cannam
date Mon, 06 Jul 2015 09:15:21 +0100
parents f98ba4f47e49
children eee4c7fd15ab
line wrap: on
line diff
--- a/Makefile.inc	Tue Apr 28 11:09:31 2015 +0100
+++ b/Makefile.inc	Mon Jul 06 09:15:21 2015 +0100
@@ -20,8 +20,8 @@
 
 PLUGIN	:= silvet$(PLUGIN_EXT)
 
-PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h $(SRC_DIR)/Instruments.h
-PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/Instruments.cpp $(SRC_DIR)/libmain.cpp
+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)/src/Allocators.cpp
@@ -58,7 +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: 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
@@ -68,6 +68,16 @@
 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
 flattendynamics/flattendynamics-ladspa.o: flattendynamics/flattendynamics-ladspa.h
 src/Silvet.o: src/MedianFilter.h src/Instruments.h
+src/LiveInstruments.o: src/Instruments.h