Mercurial > hg > sonic-visualiser

diff server.pro @ 2008:55d9bbf1fe45 zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 14:05:41 +0100
parents 810a0b8f5472
children 555e3add86b2
line wrap: on
line diff
--- a/server.pro	Mon Sep 17 13:53:25 2018 +0100
+++ b/server.pro	Mon Sep 17 14:05:41 2018 +0100
@@ -1,8 +1,7 @@
 
 TEMPLATE = app
 
-CONFIG += stl c++11 exceptions console warn_on
-
+CONFIG += stl exceptions console warn_on
 CONFIG -= qt
 
 exists(config.pri) {
@@ -31,7 +30,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 +43,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