Mercurial > hg > piper-vamp-js

diff Makefile.inc @ 138:4b593b643918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update API usage throughout to match revised framing layout
author Chris Cannam <cannam@all-day-breakfast.com>
date Wed, 08 Feb 2017 18:01:59 +0000
parents 704b93c2456e
children 40be64894bc2
line wrap: on
line diff
--- a/Makefile.inc	Thu Jan 19 09:27:59 2017 +0000
+++ b/Makefile.inc	Wed Feb 08 18:01:59 2017 +0000
@@ -46,7 +46,7 @@
 		$(SDK_DIR)/src/vamp-sdk/FFT.cpp
 
 OTHER_SOURCES	:= \
-		$(PIPERCPP_DIR)/json11/json11.cpp
+		$(PIPERCPP_DIR)/ext/json11/json11.cpp
 
 EM_MODULE_EXT	:= .js
 EM_MODULE	:= $(MODULE_NAME)$(EM_MODULE_EXT)
@@ -71,7 +71,7 @@
 OPTFLAGS	?= -O
 
 DEFINES		:= $(DEFINES)
-INCLUDES	:= -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCLUDES)
+INCLUDES	:= -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) -I$(PIPERCPP_DIR)/ext $(INCLUDES)
 
 em:	$(EM_MODULE)
 em:	CXX		:= em++