comparison runner.pro @ 81:9f78c80c80f1

Merge from qt5 branch. We now require qt5 for Sonic Annotator
author Chris Cannam
date Wed, 08 May 2013 16:52:37 +0100
parents 2ec785054483
children e3b4bac5b114
comparison
equal deleted inserted replaced
73:b9b145d3013c 81:9f78c80c80f1
2 2
3 include(config.pri) 3 include(config.pri)
4 4
5 CONFIG += qt thread warn_on stl rtti exceptions console 5 CONFIG += qt thread warn_on stl rtti exceptions console
6 QT += xml network 6 QT += xml network
7 QT -= gui 7 QT -= gui widgets
8 8
9 # Using the "console" CONFIG flag above should ensure this happens for 9 # Using the "console" CONFIG flag above should ensure this happens for
10 # normal Windows builds, but the console feature doesn't get picked up 10 # normal Windows builds, but the console feature doesn't get picked up
11 # in my local cross-compile setup because qmake itself doesn't know to 11 # in my local cross-compile setup because qmake itself doesn't know to
12 # look for win32 features 12 # look for win32 features
19 #DEFINES += HAVE_FFTW3 19 #DEFINES += HAVE_FFTW3
20 20
21 TARGET = sonic-annotator 21 TARGET = sonic-annotator
22 22
23 DEPENDPATH += . svcore 23 DEPENDPATH += . svcore
24 INCLUDEPATH += . svcore 24 INCLUDEPATH += . dataquay svcore
25 25
26 QMAKE_LIBDIR = svcore $$QMAKE_LIBDIR 26 QMAKE_LIBDIR = svcore $$QMAKE_LIBDIR
27 27
28 QMAKE_CXXFLAGS_RELEASE += -fmessage-length=80 -fdiagnostics-show-location=every-line 28 QMAKE_CXXFLAGS_RELEASE += -fmessage-length=80 -fdiagnostics-show-location=every-line
29 29
30 OBJECTS_DIR = o 30 OBJECTS_DIR = o
31 MOC_DIR = o 31 MOC_DIR = o
32 32
33 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack 33 contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
34 34
35 LIBS = -lsvcore $$LIBS 35 MY_LIBS = -Lsvcore -Ldataquay -lsvcore -ldataquay
36
37 linux* {
38 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
39 }
40
41 LIBS = $$MY_LIBS $$LIBS
36 42
37 PRE_TARGETDEPS += svcore/libsvcore.a 43 PRE_TARGETDEPS += svcore/libsvcore.a
38 44
39 HEADERS += \ 45 HEADERS += \
40 runner/AudioDBFeatureWriter.h \ 46 runner/AudioDBFeatureWriter.h \
47 runner/DefaultFeatureWriter.cpp \ 53 runner/DefaultFeatureWriter.cpp \
48 runner/FeatureExtractionManager.cpp \ 54 runner/FeatureExtractionManager.cpp \
49 runner/AudioDBFeatureWriter.cpp \ 55 runner/AudioDBFeatureWriter.cpp \
50 runner/FeatureWriterFactory.cpp 56 runner/FeatureWriterFactory.cpp
51 57
58 !win32 {
59 QMAKE_POST_LINK=/bin/bash tests/test.sh
60 }
61