Add JSON support directly to the server. Had hoped to avoid this (using Capnp as canonical in the server and then converting externally as necessary) but it's just too useful for debugging purposes when bundled with client app
| author |
Chris Cannam <c.cannam@qmul.ac.uk> |
| date |
Thu, 27 Oct 2016 11:39:41 +0100 |
| parents |
5a716f08e4be |
| children |
ff3fd8d1b2dc |
| rev |
line source |
|
c@75
|
1
|
|
c@75
|
2 VAMPSDK_DIR := ../vamp-plugin-sdk
|
|
c@75
|
3 PIPER_DIR := ../piper
|
|
c@8
|
4
|
|
c@103
|
5 CXXFLAGS := -Wall -Wextra -Werror -g3 -std=c++11
|
|
c@116
|
6 INCFLAGS := -I$(VAMPSDK_DIR) -I. -I/usr/local/include
|
|
c@116
|
7
|
|
c@116
|
8 LDFLAGS := -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj
|
|
c@116
|
9
|
|
c@116
|
10 LDFLAGS += -ldl
|
|
c@8
|
11
|
|
c@75
|
12 all: o bin bin/piper-convert bin/piper-vamp-server
|
|
c@32
|
13
|
|
c@75
|
14 bin:
|
|
c@75
|
15 mkdir bin
|
|
c@23
|
16
|
|
c@75
|
17 o:
|
|
c@75
|
18 mkdir o
|
|
c@75
|
19
|
|
c@75
|
20 bin/piper-convert: o/convert.o o/json11.o o/piper.capnp.o
|
|
c@23
|
21 c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
|
|
c@8
|
22
|
|
c@116
|
23 bin/piper-vamp-server: o/server.o o/json11.o o/piper.capnp.o
|
|
c@31
|
24 c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
|
|
c@31
|
25
|
|
c@115
|
26 #vamp-capnp/piper.capnp.h: $(PIPER_DIR)/capnp/piper.capnp
|
|
c@115
|
27 # capnp compile -oc++:vamp-capnp --src-prefix=$(PIPER_DIR)/capnp $<
|
|
c@8
|
28
|
|
c@75
|
29 o/piper.capnp.o: vamp-capnp/piper.capnp.c++ vamp-capnp/piper.capnp.h
|
|
c@37
|
30 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@27
|
31
|
|
c@75
|
32 o/json11.o: json11/json11.cpp
|
|
c@27
|
33 c++ $(CXXFLAGS) -c $< -o $@
|
|
c@27
|
34
|
|
c@75
|
35 o/convert.o: vamp-server/convert.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@23
|
36 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@23
|
37
|
|
c@116
|
38 o/server.o: vamp-server/server.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
|
|
c@31
|
39 c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
|
|
c@31
|
40
|
|
c@8
|
41 test: all
|
|
c@75
|
42 test/test-server.sh
|
|
c@8
|
43
|
|
c@8
|
44 clean:
|
|
c@75
|
45 rm -f */*.o vamp-capnp/piper.capnp.h vamp-capnp/piper.capnp.c++
|
|
c@8
|
46
|
|
c@8
|
47 distclean: clean
|
|
c@8
|
48 rm -f bin/*
|
|
c@8
|
49
|
|
c@70
|
50 # cancel implicit rule which otherwise could try to link %.capnp
|
|
c@70
|
51 %: %.o
|
