Mercurial > hg > piper-vamp-js

diff Makefile.inc.em @ 43:90bf9d9f9c95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rearrange and rename VamPipe -> Piper as appropriate
author Chris Cannam
date Mon, 10 Oct 2016 17:05:37 +0100
parents 946c965fd1eb
children afaeb2258678
line wrap: on
line diff
--- a/Makefile.inc.em	Fri Oct 07 16:43:18 2016 +0100
+++ b/Makefile.inc.em	Mon Oct 10 17:05:37 2016 +0100
@@ -1,8 +1,9 @@
 
-ADAPTER_HEADERS	:= VamPipeAdapter.h VamPipePluginLibrary.h 
-ADAPTER_SOURCES	:= VamPipePluginLibrary.cpp
+ADAPTER_HEADERS	:= PiperAdapter.h PiperPluginLibrary.h 
+ADAPTER_SOURCES	:= PiperPluginLibrary.cpp
 
 SDK_DIR		:= ../vamp-plugin-sdk
+PIPERCPP_DIR    := ../piper-cpp
 
 SDK_SOURCES	:= \
         	$(SDK_DIR)/src/vamp-hostsdk/PluginBufferingAdapter.cpp \
@@ -19,7 +20,7 @@
 		$(SDK_DIR)/src/vamp-sdk/FFT.cpp
 
 OTHER_SOURCES	:= \
-		../json/json11/json11.cpp
+		$(PIPERCPP_DIR)/json11/json11.cpp
 
 MODULE_EXT	:= .js
 MODULE		:= $(MODULE_NAME)$(MODULE_EXT)
@@ -31,7 +32,7 @@
 		-s NO_FILESYSTEM=1 \
 		-s ERROR_ON_UNDEFINED_SYMBOLS=1 \
 	    	-s EXPORT_NAME="'$(MODULE_SYMBOL)'" \
-	    	-s EXPORTED_FUNCTIONS="['_vampipeRequestJson','_vampipeProcessRaw','_vampipeFreeJson']" \
+	    	-s EXPORTED_FUNCTIONS="['_piperRequestJson','_piperProcessRaw','_piperFreeJson']" \
 		$(EMFLAGS)
 
 CXX_SOURCES	:= $(MODULE_SOURCE) $(ADAPTER_SOURCES) $(PLUGIN_SOURCES) $(SDK_SOURCES) $(OTHER_SOURCES)
@@ -45,7 +46,7 @@
 
 DEFINES		:= $(DEFINES)
 
-INCPATH		:= -I$(SDK_DIR) -I.. -I../json $(INCPATH)
+INCPATH		:= -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCPATH)
 
 CXXFLAGS	:= -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH)
 CFLAGS		:= -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH)