# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1495439822 -3600
# Node ID db929669e7d3564ec09cf41bf7ee347fa11233de
# Parent  ea8994465322db9144fb51b47280ff8c70a68d50
*Ahem* Rebuild for actual capnp v0.6.

(Really should find a better way than committing these!)
Also simplify Makefile a bit, remove o directory.

diff -r ea8994465322 -r db929669e7d3 Makefile
--- 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
diff -r ea8994465322 -r db929669e7d3 vamp-capnp/piper.capnp.h
--- 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