Mercurial > hg > sonic-visualiser
comparison base.pro @ 2075:dd479ad12c29 zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 06 Nov 2018 10:43:23 +0000 |
parents | 555e3add86b2 |
children | 1799e90689b5 |
comparison
equal
deleted
inserted
replaced
2041:214ee4c2bc61 | 2075:dd479ad12c29 |
---|---|
33 DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) | 33 DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) |
34 | 34 |
35 CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) | 35 CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) |
36 CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) | 36 CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) |
37 | 37 |
38 CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS) | 38 CLIENT_HEADERS=$$fromfile(piper-vamp-cpp/vamp-client/qt/test.pro, HEADERS) |
39 | 39 |
40 for (file, BQ_SOURCES) { SOURCES += $$file } | 40 for (file, BQ_SOURCES) { SOURCES += $$file } |
41 for (file, BQ_HEADERS) { HEADERS += $$file } | 41 for (file, BQ_HEADERS) { HEADERS += $$file } |
42 | 42 |
43 for (file, VAMP_SOURCES) { SOURCES += $$file } | 43 for (file, VAMP_SOURCES) { SOURCES += $$file } |
51 | 51 |
52 for (file, SVCORE_SOURCES) { SOURCES += $$sprintf("svcore/%1", $$file) } | 52 for (file, SVCORE_SOURCES) { SOURCES += $$sprintf("svcore/%1", $$file) } |
53 for (file, SVCORE_HEADERS) { HEADERS += $$sprintf("svcore/%1", $$file) } | 53 for (file, SVCORE_HEADERS) { HEADERS += $$sprintf("svcore/%1", $$file) } |
54 | 54 |
55 for (file, CLIENT_HEADERS) { | 55 for (file, CLIENT_HEADERS) { |
56 HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1", $$file) | 56 HEADERS += $$sprintf("piper-vamp-cpp/vamp-client/qt/%1", $$file) |
57 } | 57 } |
58 | 58 |
59 SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp | 59 SOURCES += piper-vamp-cpp/vamp-capnp/piper-capnp.cpp |
60 | 60 |