diff convert.pro @ 2008:55d9bbf1fe45 zoom

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/convert.pro	Mon Sep 17 13:53:25 2018 +0100
+++ b/convert.pro	Mon Sep 17 14:05:41 2018 +0100
@@ -1,7 +1,7 @@
 
 TEMPLATE = app
 
-CONFIG += stl c++11 exceptions console warn_on
+CONFIG += stl exceptions console warn_on 
 
 CONFIG -= qt
 
@@ -31,7 +31,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 +44,5 @@
 
 SOURCES += \
         piper-cpp/vamp-capnp/piper-capnp.cpp \
-        piper-cpp/json11/json11.cpp \
+        piper-cpp/ext/json11/json11.cpp \
         piper-cpp/vamp-server/convert.cpp