changeset 242:bb4b80c2987b

Promote Vamp SDK flags
author Chris Cannam
date Fri, 18 Mar 2016 13:43:00 +0000
parents 7c4f7cd065a0
children 090b26a4d050
files .hgsubstate runner.pro
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 01 16:02:53 2016 +0000
+++ b/.hgsubstate	Fri Mar 18 13:43:00 2016 +0000
@@ -1,4 +1,4 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-134ce7667256fb204f3bebd293c252bc57cbe07e svcore
+0ad516dc5d8d1eac370c7f43eeb7775919e0f2e9 svcore
 55de53d7c777008997721bb43051a67c3b3772d2 vamp-plugin-sdk
--- a/runner.pro	Tue Mar 01 16:02:53 2016 +0000
+++ b/runner.pro	Fri Mar 18 13:43:00 2016 +0000
@@ -1,5 +1,7 @@
 TEMPLATE = app
 
+INCLUDEPATH += vamp-plugin-sdk
+
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
     LIBS += -Lsv-dependency-builds/win32-mingw/lib
@@ -13,8 +15,6 @@
     LIBS += -Lsv-dependency-builds/osx/lib
 }
 
-INCLUDEPATH += vamp-plugin-sdk
-
 exists(config.pri) {
     include(config.pri)
 }
@@ -24,7 +24,7 @@
     CONFIG += release
     DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
 
-    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_DATAQUAY HAVE_MAD HAVE_ID3TAG
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_DATAQUAY HAVE_MAD HAVE_ID3TAG
 
     LIBS += -lbz2 -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -lz -lsord-0 -lserd-0
 
@@ -50,7 +50,7 @@
 # look for win32 features
 win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
 
-DEFINES += HAVE_FFTW3
+DEFINES += HAVE_FFTW3 HAVE_VAMP HAVE_VAMPHOSTSDK
 
 TARGET = sonic-annotator