Mercurial > hg > piper-cpp
diff Makefile @ 150:bf8e3e7dd7de
Move some things around, and add overall test script
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Fri, 20 Jan 2017 17:45:54 +0000 |
| parents | ea06fae1567c |
| children | 3eb00e5c76c4 |
line wrap: on
line diff
--- a/Makefile Thu Jan 19 14:05:21 2017 +0000 +++ b/Makefile Fri Jan 20 17:45:54 2017 +0000 @@ -3,7 +3,7 @@ PIPER_DIR := ../piper CXXFLAGS := -Wall -Wextra -Werror -g3 -std=c++11 -INCFLAGS := -I$(VAMPSDK_DIR) -I. -I/usr/local/include +INCFLAGS := -Iext -I$(VAMPSDK_DIR) -I. -I/usr/local/include #LDFLAGS := -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj LDFLAGS := $(VAMPSDK_DIR)/libvamp-hostsdk.a -lcapnp -lkj @@ -24,13 +24,10 @@ bin/piper-vamp-simple-server: o/simple-server.o o/json11.o o/piper.capnp.o c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -#vamp-capnp/piper.capnp.h: $(PIPER_DIR)/capnp/piper.capnp -# capnp compile -oc++:vamp-capnp --src-prefix=$(PIPER_DIR)/capnp $< - o/piper.capnp.o: vamp-capnp/piper.capnp.c++ vamp-capnp/piper.capnp.h c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ -o/json11.o: json11/json11.cpp +o/json11.o: ext/json11/json11.cpp c++ $(CXXFLAGS) -c $< -o $@ o/convert.o: vamp-server/convert.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h @@ -40,7 +37,7 @@ c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@ test: all - test/test-server.sh + vamp-server/test.sh clean: rm -f */*.o