Mercurial > hg > sonic-visualiser
diff server.pro @ 1304:6e47bd2263e2 piper
Merge from branch project-file-rework
author | Chris Cannam |
---|---|
date | Fri, 28 Oct 2016 15:19:12 +0100 |
parents | 409ee88107e8 |
children | 106a16cfdd2f |
line wrap: on
line diff
--- a/server.pro Tue Oct 25 11:02:03 2016 +0100 +++ b/server.pro Fri Oct 28 15:19:12 2016 +0100 @@ -1,52 +1,42 @@ TEMPLATE = app -CONFIG += qt stl c++11 exceptions console warn_on -QT -= xml network gui widgets +CONFIG += stl c++11 exceptions console warn_on + +CONFIG -= qt exists(config.pri) { include(config.pri) } -win32-g++ { - INCLUDEPATH += sv-dependency-builds/win32-mingw/include - LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib +!exists(config.pri) { + include(noconfig.pri) + + macx*: LIBS -= -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate -lbz2 -lz } -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 -} + +# Can't support this flag with the JSON11 and basen modules as they stand +QMAKE_CXXFLAGS -= -Werror # 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-x-g++: QMAKE_LFLAGS += -Wl,-subsystem,console -!win32 { - QMAKE_CXXFLAGS += -Werror -} +macx*: CONFIG -= app_bundle -TARGET = piper-vamp-server +linux*: LIBS += -ldl + +TARGET = piper-vamp-simple-server OBJECTS_DIR = o MOC_DIR = o INCLUDEPATH += piper-cpp vamp-plugin-sdk -LIBS += -lcapnp -lkj + +include(vamp-plugin-sdk-files.pri) + +for (file, VAMP_SOURCES) { SOURCES += $$file } +for (file, VAMP_HEADERS) { HEADERS += $$file } HEADERS += \ piper-cpp/vamp-capnp/piper.capnp.h \ @@ -54,15 +44,5 @@ 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 + piper-cpp/json11/json11.cpp \ + piper-cpp/vamp-server/simple-server.cpp