Mercurial > hg > piper-vamp-js
changeset 159:205f9a6240f5
Use sord-single build
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Thu, 15 Jun 2017 09:50:30 +0100 |
| parents | dcd4bdf095e7 |
| children | e4d10a68b933 |
| files | Makefile generator/Makefile generator/generator.cpp test/node-load-test.js |
| diffstat | 4 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Jun 14 11:36:13 2017 +0100 +++ b/Makefile Thu Jun 15 09:50:30 2017 +0100 @@ -1,17 +1,21 @@ all: prerequisites generator examples -.PHONY: prerequisites prerequisites: ./bin/check-prerequisites.sh +clean: + $(MAKE) -C generator clean + $(MAKE) -C examples/vamp-example-plugins clean + $(MAKE) -C examples/vamp-test-plugin clean + .PHONY: generator generator: $(MAKE) -C generator .PHONY: examples examples: - $(MAKE) -C examples/vamp-example-plugins clean em - $(MAKE) -C examples/vamp-test-plugin clean em + $(MAKE) -C examples/vamp-example-plugins em + $(MAKE) -C examples/vamp-test-plugin em $(MAKE) -C examples/vamp-example-plugins test $(MAKE) -C examples/vamp-test-plugin test
--- a/generator/Makefile Wed Jun 14 11:36:13 2017 +0100 +++ b/generator/Makefile Thu Jun 15 09:50:30 2017 +0100 @@ -3,17 +3,21 @@ PIPERCPP_DIR := ../../piper-vamp-cpp PIPER_DIR := ../../piper -##!!! review -INCFLAGS := -I$(PIPERCPP_DIR)/ext -I/usr/include/sord-0 -I/usr/include/serd-0 -I$(VAMPSDK_DIR) -I$(PIPERCPP_DIR) -I/usr/local/include +INCFLAGS := -I$(PIPERCPP_DIR) -I$(PIPERCPP_DIR)/ext -I$(PIPERCPP_DIR)/ext/serd -I$(PIPERCPP_DIR)/ext/sord -I$(VAMPSDK_DIR) -I/usr/local/include + +OBJECTS := ./generator.o $(PIPERCPP_DIR)/ext/sord/sord-single.o CXXFLAGS := -Wall -Wextra -g3 -std=c++11 $(INCFLAGS) +CFLAGS := -Wall -g3 $(INCFLAGS) -LDFLAGS := $(VAMPSDK_DIR)/libvamp-hostsdk.a -lsord-0 -lserd-0 +LDFLAGS := $(VAMPSDK_DIR)/libvamp-hostsdk.a LDFLAGS += -ldl all: ../bin/piper-vamp-stub-generator -../bin/piper-vamp-stub-generator: ./generator.cpp - $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) +../bin/piper-vamp-stub-generator: $(OBJECTS) + $(CXX) $^ -o $@ $(LDFLAGS) +clean: + rm -f $(OBJECTS)
--- a/generator/generator.cpp Wed Jun 14 11:36:13 2017 +0100 +++ b/generator/generator.cpp Thu Jun 15 09:50:30 2017 +0100 @@ -36,7 +36,6 @@ #include "vamp-json/VampJson.h" #include "vamp-support/RequestOrResponse.h" #include "vamp-support/LoaderRequests.h" -#include "vamp-support/RdfTypes.h" #include <iostream> #include <sstream>
--- a/test/node-load-test.js Wed Jun 14 11:36:13 2017 +0100 +++ b/test/node-load-test.js Thu Jun 15 09:50:30 2017 +0100 @@ -181,6 +181,9 @@ adapterFlags: ["AdaptAllSafe"] } }); + +// note("Load request returned: " + JSON.stringify(response) + "\n"); + checkSuccess(response); var blockSize = response.result.defaultConfiguration.framing.blockSize;