# HG changeset patch # User Chris Cannam # Date 1499677819 -3600 # Node ID 81c92307f0d370f37b6a90ba8bc5aeaf430bf477 # Parent d2221cb43cd57207c99125d59d84470842822711# Parent 1fb1556b74be41f145f0cb8430a46a2a294a73d6 Merge diff -r 1fb1556b74be -r 81c92307f0d3 base.pri --- a/base.pri Fri Jul 07 21:36:07 2017 +0100 +++ b/base.pri Mon Jul 10 10:10:19 2017 +0100 @@ -67,16 +67,16 @@ SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp capnpc.target = piper-cpp/vamp-capnp/piper-capnp.h -capnpc.depends = piper/capnp/piper.capnp +capnpc.depends = $$PWD/piper/capnp/piper.capnp capnpc.commands = capnp compile --src-prefix=piper/capnp -oc++:piper-cpp/vamp-capnp $$capnpc.depends macx* { - capnpc.commands=./sv-dependency-builds/osx/bin/capnp -Isv-dependency-builds/osx/include compile --src-prefix=piper/capnp -osv-dependency-builds/osx/bin/capnpc-c++:piper-cpp/vamp-capnp $$capnpc.depends + capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends } win* { - capnpc.commands=./sv-dependency-builds/win64-msvc/bin/capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-cpp/vamp-capnp $$capnpc.depends + capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends } QMAKE_EXTRA_TARGETS += capnpc