diff base.pri @ 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/base.pri	Mon Sep 17 13:53:25 2018 +0100
+++ b/base.pri	Mon Sep 17 14:05:41 2018 +0100
@@ -23,7 +23,7 @@
 INCLUDEPATH += $$SV_INCLUDEPATH
 
 # Platform defines for RtMidi
-linux*:   DEFINES += __LINUX_ALSASEQ__
+linux*:   DEFINES += __LINUX_ALSASEQ__ __LINUX_ALSA__
 macx*:    DEFINES += __MACOSX_CORE__
 win*:     DEFINES += __WINDOWS_MM__
 solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__
@@ -31,37 +31,5 @@
 # Defines for Dataquay
 DEFINES += USE_SORD
 
-CONFIG += qt thread warn_on stl rtti exceptions c++11
+CONFIG += qt thread warn_on stl rtti exceptions
 
-include(bq-files.pri)
-include(vamp-plugin-sdk-files.pri)
-include(svcore/files.pri)
-
-DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
-DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)
-
-CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES)
-CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS)
-                 
-CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/client.pro, HEADERS)
-
-for (file, BQ_SOURCES)       { SOURCES += $$file }
-for (file, BQ_HEADERS)       { HEADERS += $$file }
-
-for (file, VAMP_SOURCES)     { SOURCES += $$file }
-for (file, VAMP_HEADERS)     { HEADERS += $$file }
-
-for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) }
-for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) }
-
-for (file, CHECKER_SOURCES)  { SOURCES += $$sprintf("checker/%1",  $$file) }
-for (file, CHECKER_HEADERS)  { HEADERS += $$sprintf("checker/%1",  $$file) }
-
-for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
-for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
-             
-for (file, CLIENT_HEADERS) {
-    HEADERS += $$sprintf("piper-cpp/vamp-client/%1",  $$file)
-}
-    
-SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp