Mercurial > hg > sonic-visualiser
changeset 1560:106a16cfdd2f
Update piper-cpp to github repo, and adjust build for revised layout in it
| author | Chris Cannam |
|---|---|
| date | Fri, 20 Jan 2017 18:05:41 +0000 |
| parents | 1eb16d08c421 |
| children | 152e18727238 |
| files | .hgsub .hgsubstate base.pri convert.pro server.pro |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Thu Jan 19 11:01:41 2017 +0000 +++ b/.hgsub Fri Jan 20 18:05:41 2017 +0000 @@ -10,4 +10,4 @@ sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds icons/scalable = https://code.soundsoftware.ac.uk/hg/sv-iconset checker = https://code.soundsoftware.ac.uk/hg/vamp-plugin-load-checker -piper-cpp = https://code.soundsoftware.ac.uk/hg/piper-cpp +piper-cpp = [git]:https://github.com/piper-audio/piper-cpp
--- a/.hgsubstate Thu Jan 19 11:01:41 2017 +0000 +++ b/.hgsubstate Fri Jan 20 18:05:41 2017 +0000 @@ -5,9 +5,9 @@ d4548b18eaf20cb10045cf246af891d491c8cc32 checker 3768bdde6fdf866aa63fff5bde8d9fa64a8979ef dataquay 3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable -74c5013d88cd246f85710883b172592b9d0ab370 piper-cpp +471c097ed526e16fe830f4f67dca3f6f3397ff83 piper-cpp 95867ba8caa86f69fdd57366dbfe2f977dd9cb5d sv-dependency-builds 48cfa4e2bfc13b302f86ec17910249ee47cd9989 svapp -7fb7b59c35ee3f2b142736b76352aa07213b61c7 svcore +54fabf5aceb896f2166b4fbe4f742db2a0b9008e svcore c06861dec2452e4b18e596ee2485c909a42151b3 svgui ea8e56f0796afebe78e9e678f4b674c1d7fb279e vamp-plugin-sdk
--- a/base.pri Thu Jan 19 11:01:41 2017 +0000 +++ b/base.pri Fri Jan 20 18:05:41 2017 +0000 @@ -43,7 +43,7 @@ CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) -CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/client.pro, HEADERS) +CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS) for (file, BQ_SOURCES) { SOURCES += $$file } for (file, BQ_HEADERS) { HEADERS += $$file } @@ -61,7 +61,7 @@ for (file, SVCORE_HEADERS) { HEADERS += $$sprintf("svcore/%1", $$file) } for (file, CLIENT_HEADERS) { - HEADERS += $$sprintf("piper-cpp/vamp-client/%1", $$file) + HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1", $$file) } SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
--- a/convert.pro Thu Jan 19 11:01:41 2017 +0000 +++ b/convert.pro Fri Jan 20 18:05:41 2017 +0000 @@ -31,7 +31,7 @@ OBJECTS_DIR = o MOC_DIR = o -INCLUDEPATH += piper-cpp vamp-plugin-sdk +INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk include(vamp-plugin-sdk-files.pri) @@ -44,5 +44,5 @@ SOURCES += \ piper-cpp/vamp-capnp/piper-capnp.cpp \ - piper-cpp/json11/json11.cpp \ + piper-cpp/ext/json11/json11.cpp \ piper-cpp/vamp-server/convert.cpp
--- a/server.pro Thu Jan 19 11:01:41 2017 +0000 +++ b/server.pro Fri Jan 20 18:05:41 2017 +0000 @@ -31,7 +31,7 @@ OBJECTS_DIR = o MOC_DIR = o -INCLUDEPATH += piper-cpp vamp-plugin-sdk +INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk include(vamp-plugin-sdk-files.pri) @@ -44,5 +44,5 @@ SOURCES += \ piper-cpp/vamp-capnp/piper-capnp.cpp \ - piper-cpp/json11/json11.cpp \ + piper-cpp/ext/json11/json11.cpp \ piper-cpp/vamp-server/simple-server.cpp