diff convert.pro @ 2075:dd479ad12c29 zoom

Merge from default branch
author Chris Cannam
date Tue, 06 Nov 2018 10:43:23 +0000
parents 555e3add86b2
children
line wrap: on
line diff
--- a/convert.pro	Fri Oct 12 11:15:09 2018 +0100
+++ b/convert.pro	Tue Nov 06 10:43:23 2018 +0000
@@ -31,7 +31,7 @@
 OBJECTS_DIR = o
 MOC_DIR = o
 
-INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk
+INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
 
 include(vamp-plugin-sdk-files.pri)
 
@@ -39,10 +39,10 @@
 for (file, VAMP_HEADERS) { HEADERS += $$file }
 
 HEADERS += \
-        piper-cpp/vamp-capnp/piper.capnp.h \
-        piper-cpp/vamp-capnp/VampnProto.h
+        piper-vamp-cpp/vamp-capnp/piper.capnp.h \
+        piper-vamp-cpp/vamp-capnp/VampnProto.h
 
 SOURCES += \
-        piper-cpp/vamp-capnp/piper-capnp.cpp \
-        piper-cpp/ext/json11/json11.cpp \
-        piper-cpp/vamp-server/convert.cpp
+        piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \
+        piper-vamp-cpp/ext/json11/json11.cpp \
+        piper-vamp-cpp/vamp-server/convert.cpp