Mercurial > hg > sonic-visualiser
changeset 1282:5b4f4de87892 piper
Merge
author | Chris Cannam |
---|---|
date | Tue, 25 Oct 2016 11:02:03 +0100 (2016-10-25) |
parents | e9197aa8ea24 (current diff) eb60f984c66c (diff) |
children | ca5dcee081ef 6e47bd2263e2 |
files | |
diffstat | 2 files changed, 71 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server.pro Tue Oct 25 11:02:03 2016 +0100 @@ -0,0 +1,68 @@ + +TEMPLATE = app + +CONFIG += qt stl c++11 exceptions console warn_on +QT -= xml network gui widgets + +exists(config.pri) { + include(config.pri) +} + +win32-g++ { + INCLUDEPATH += sv-dependency-builds/win32-mingw/include + LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib +} +win32-msvc* { + # We actually expect MSVC to be used only for 64-bit builds, + # though the qmake spec is still called win32-msvc* + INCLUDEPATH += sv-dependency-builds/win64-msvc/include +# bah, this is happening even if not debug build + CONFIG(debug) { + LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ + -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \ + -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib + } +# CONFIG(release) { +# LIBS += -Lrelease \ +# -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib +# } +} +mac* { + INCLUDEPATH += sv-dependency-builds/osx/include + LIBS += -Lsv-dependency-builds/osx/lib +} + +# Using the "console" CONFIG flag above should ensure this happens for +# normal Windows builds, but this may be necessary when cross-compiling +win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console + +!win32 { + QMAKE_CXXFLAGS += -Werror +} + +TARGET = piper-vamp-server + +OBJECTS_DIR = o +MOC_DIR = o + +INCLUDEPATH += piper-cpp vamp-plugin-sdk +LIBS += -lcapnp -lkj + +HEADERS += \ + piper-cpp/vamp-capnp/piper.capnp.h \ + piper-cpp/vamp-capnp/VampnProto.h + +SOURCES += \ + piper-cpp/vamp-capnp/piper-capnp.cpp \ + piper-cpp/vamp-server/server.cpp + +SOURCES += \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginBufferingAdapter.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginChannelAdapter.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginHostAdapter.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginLoader.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/PluginWrapper.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \ + vamp-plugin-sdk/src/vamp-hostsdk/Files.cpp
--- a/sonic-visualiser.pro Tue Oct 25 10:53:12 2016 +0100 +++ b/sonic-visualiser.pro Tue Oct 25 11:02:03 2016 +0100 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = sub_bq sub_dataquay svcore svgui svapp checker sub_sv +SUBDIRS = sub_bq sub_dataquay svcore svgui svapp checker sub_server sub_sv !win* { # We should build and run the tests on any platform, @@ -13,6 +13,8 @@ sub_dataquay.file = dataquay/lib.pro +sub_server.file = server.pro + svgui.depends = svcore svapp.depends = svcore svgui sub_sv.depends = svcore svgui svapp