Mercurial > hg > piper-cpp
changeset 219:db929669e7d3
*Ahem* Rebuild for actual capnp v0.6.
(Really should find a better way than committing these!)
Also simplify Makefile a bit, remove o directory.
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Mon, 22 May 2017 08:57:02 +0100 |
| parents | ea8994465322 |
| children | 02de5df3a884 8a031eb9a25f |
| files | Makefile vamp-capnp/piper.capnp.h |
| diffstat | 2 files changed, 7 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue May 09 11:46:23 2017 +0100 +++ b/Makefile Mon May 22 08:57:02 2017 +0100 @@ -10,28 +10,27 @@ LDFLAGS += -ldl +COMMON_OBJS := ext/json11/json11.o vamp-capnp/piper.capnp.o + TEST_SRCS := test/main.cpp test/vamp-client/tst_PluginStub.cpp TEST_OBJS := $(TEST_SRCS:.cpp=.o) -all: o bin bin/piper-convert bin/piper-vamp-simple-server bin/test-suite +all: bin bin/piper-convert bin/piper-vamp-simple-server bin/test-suite bin: mkdir bin -o: - mkdir o - -bin/piper-convert: o/convert.o o/json11.o o/piper.capnp.o +bin/piper-convert: vamp-server/convert.o $(COMMON_OBJS) c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -bin/piper-vamp-simple-server: o/simple-server.o o/json11.o o/piper.capnp.o +bin/piper-vamp-simple-server: vamp-server/simple-server.o $(COMMON_OBJS) c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) bin/test-suite: $(TEST_OBJS) c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) bin/test-suite -o/piper.capnp.o: vamp-capnp/piper.capnp.c++ +vamp-capnp/piper.capnp.o: vamp-capnp/piper.capnp.c++ c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ vamp-capnp/piper.capnp.h: vamp-capnp/piper.capnp.c++ @@ -39,15 +38,6 @@ vamp-capnp/piper.capnp.c++: $(PIPER_DIR)/capnp/piper.capnp capnpc --src-prefix=$(PIPER_DIR)/capnp -oc++:vamp-capnp $< -o/json11.o: ext/json11/json11.cpp - c++ $(CXXFLAGS) -c $< -o $@ - -o/convert.o: vamp-server/convert.cpp - c++ $(CXXFLAGS) -c $< -o $@ - -o/simple-server.o: vamp-server/simple-server.cpp - c++ $(CXXFLAGS) -c $< -o $@ - test: all bin/test-suite -s -d yes vamp-server/test.sh
--- a/vamp-capnp/piper.capnp.h Tue May 09 11:46:23 2017 +0100 +++ b/vamp-capnp/piper.capnp.h Mon May 22 08:57:02 2017 +0100 @@ -6,7 +6,7 @@ #include <capnp/generated-header-support.h> -#if CAPNP_VERSION != 7000 +#if CAPNP_VERSION != 6000 #error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library." #endif