diff --git a/sonic-visualiser/base.pri b/sonic-visualiser/base.pri index 9dae860..de9ff10 100644 --- a/sonic-visualiser/base.pri +++ b/sonic-visualiser/base.pri @@ -13,8 +13,6 @@ SV_INCLUDEPATH = \ piper-vamp-cpp \ checker \ checker/checker \ - dataquay \ - dataquay/dataquay \ svcore \ svcore/data \ svcore/plugin/api/alsa \ @@ -34,4 +32,5 @@ solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__ # Defines for Dataquay DEFINES += USE_SORD -CONFIG += qt thread warn_on stl rtti exceptions +CONFIG += qt thread warn_on stl rtti exceptions link_pkgconfig +PKGCONFIG += dataquay diff --git a/sonic-visualiser/base.pro b/sonic-visualiser/base.pro index 2334dd3..9d4feca 100644 --- a/sonic-visualiser/base.pro +++ b/sonic-visualiser/base.pro @@ -29,9 +29,6 @@ include(vamp-plugin-sdk-files.pri) include(svcore/files.pri) include(capnp-regen.pri) -DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) -DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) - CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES) CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS) @@ -43,9 +40,6 @@ for (file, BQ_HEADERS) { HEADERS += $$file } for (file, VAMP_SOURCES) { SOURCES += $$file } for (file, VAMP_HEADERS) { HEADERS += $$file } -for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) } -for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) } - for (file, CHECKER_SOURCES) { SOURCES += $$sprintf("checker/%1", $$file) } for (file, CHECKER_HEADERS) { HEADERS += $$sprintf("checker/%1", $$file) }