Mercurial > hg > piper-cpp
diff vamp-client/Makefile @ 84:db9a6ab618bc
Client builds; does not run
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Wed, 12 Oct 2016 11:59:57 +0100 |
| parents | 154e94ea84d4 |
| children | 7a77a374b6b2 |
line wrap: on
line diff
--- a/vamp-client/Makefile Tue Oct 11 17:08:31 2016 +0100 +++ b/vamp-client/Makefile Wed Oct 12 11:59:57 2016 +0100 @@ -36,7 +36,7 @@ DISTDIR = /home/cannam/code/piper-cpp/o/client1.0.0 LINK = g++ LFLAGS = -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro -LIBS = $(SUBLIBS) -lQt5Core -lpthread +LIBS = $(SUBLIBS) -lcapnp -lkj -lvamp-hostsdk -lQt5Core -lpthread AR = ar cqs RANLIB = SED = sed @@ -48,8 +48,10 @@ ####### Files -SOURCES = client.cpp -OBJECTS = ../o/client.o +SOURCES = client.cpp \ + ../vamp-capnp/piper.capnp.c++ +OBJECTS = ../o/client.o \ + ../o/piper.capnp.o DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \ /usr/lib/qt/mkspecs/common/unix.conf \ /usr/lib/qt/mkspecs/common/linux.conf \ @@ -203,7 +205,8 @@ /usr/lib/qt/mkspecs/features/testcase_targets.prf \ /usr/lib/qt/mkspecs/features/yacc.prf \ /usr/lib/qt/mkspecs/features/lex.prf \ - client.pro client.cpp + client.pro client.cpp \ + ../vamp-capnp/piper.capnp.c++ QMAKE_TARGET = client DESTDIR = TARGET = client @@ -540,7 +543,7 @@ distdir: FORCE @test -d $(DISTDIR) || mkdir -p $(DISTDIR) $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents client.cpp $(DISTDIR)/ + $(COPY_FILE) --parents client.cpp ../vamp-capnp/piper.capnp.c++ $(DISTDIR)/ clean: compiler_clean @@ -583,6 +586,9 @@ ../o/client.o: client.cpp stub.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../o/client.o client.cpp +../o/piper.capnp.o: ../vamp-capnp/piper.capnp.c++ ../vamp-capnp/piper.capnp.h + $(CC) -c $(CFLAGS) $(INCPATH) -o ../o/piper.capnp.o ../vamp-capnp/piper.capnp.c++ + ####### Install install: FORCE