Mercurial > hg > piper-cpp
diff Makefile @ 27:cc85c2851605
Wire up Cap'n Proto reading, plus some build and arg processing fixes
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Tue, 24 May 2016 12:00:38 +0100 |
| parents | d678cd00e593 |
| children | b376ab0ce003 |
line wrap: on
line diff
--- a/Makefile Tue May 24 11:07:59 2016 +0100 +++ b/Makefile Tue May 24 12:00:38 2016 +0100 @@ -1,29 +1,35 @@ -CXXFLAGS := -Wall -Werror -std=c++11 +CXXFLAGS := -Wall -Werror -O3 -std=c++11 INCFLAGS := -Ivamp-plugin-sdk -Ijson -Icapnproto -I. LDFLAGS := -Lvamp-plugin-sdk -Wl,-Bstatic -lvamp-hostsdk -Wl,-Bdynamic -lcapnp -lkj -ldl all: bin/vamp-json-cli bin/vamp-json-to-capnp bin/vampipe-convert -bin/vampipe-convert: utilities/vampipe-convert.o json/json11/json11.o +bin/vampipe-convert: o/vampipe-convert.o o/json11.o o/vamp.capnp.o c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -bin/vamp-json-to-capnp: utilities/json-to-capnp.o json/json11/json11.o +bin/vamp-json-to-capnp: o/json-to-capnp.o o/json11.o c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -bin/vamp-json-cli: utilities/json-cli.o json/json11/json11.o +bin/vamp-json-cli: o/json-cli.o o/json11.o c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) capnproto/vamp.capnp.h: capnproto/vamp.capnp capnp compile $< -oc++ -utilities/vampipe-convert.o: utilities/vampipe-convert.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h json/VampJson.h +o/vamp.capnp.o: capnproto/vamp.capnp.c++ capnproto/vamp.capnp.h + c++ $(CXXFLAGS) -c $< -o $@ + +o/json11.o: json/json11/json11.cpp + c++ $(CXXFLAGS) -c $< -o $@ + +o/vampipe-convert.o: utilities/vampipe-convert.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h json/VampJson.h c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ -utilities/json-to-capnp.o: utilities/json-to-capnp.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h json/VampJson.h +o/json-to-capnp.o: utilities/json-to-capnp.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h json/VampJson.h c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ -utilities/json-cli.o: utilities/json-cli.cpp json/VampJson.h +o/json-cli.o: utilities/json-cli.cpp json/VampJson.h c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ test: all @@ -31,7 +37,7 @@ VAMP_PATH=./vamp-plugin-sdk/examples test/test-json-to-capnp.sh clean: - rm -f */*.o capnp/vamp.capnp.h capnp/vamp.capnp.c++ + rm -f */*.o capnproto/vamp.capnp.h capnproto/vamp.capnp.c++ distclean: clean rm -f bin/*