comparison runner.pro @ 161:4b19d824a213 jams

Merge from default branch
author Chris Cannam
date Wed, 15 Oct 2014 11:33:14 +0100
parents 3921e0c1f4dd 6ff4da31db8b
children f0f57af581d7
comparison
equal deleted inserted replaced
153:ad96fd5f9cd7 161:4b19d824a213
83 runner/AudioDBFeatureWriter.h \ 83 runner/AudioDBFeatureWriter.h \
84 runner/FeatureWriterFactory.h \ 84 runner/FeatureWriterFactory.h \
85 runner/DefaultFeatureWriter.h \ 85 runner/DefaultFeatureWriter.h \
86 runner/FeatureExtractionManager.h \ 86 runner/FeatureExtractionManager.h \
87 runner/JAMSFeatureWriter.h \ 87 runner/JAMSFeatureWriter.h \
88 runner/LabFeatureWriter.h \
88 runner/MIDIFeatureWriter.h \ 89 runner/MIDIFeatureWriter.h \
89 runner/MultiplexedReader.h 90 runner/MultiplexedReader.h
90 91
91 SOURCES += \ 92 SOURCES += \
92 runner/main.cpp \ 93 runner/main.cpp \
93 runner/DefaultFeatureWriter.cpp \ 94 runner/DefaultFeatureWriter.cpp \
94 runner/FeatureExtractionManager.cpp \ 95 runner/FeatureExtractionManager.cpp \
95 runner/AudioDBFeatureWriter.cpp \ 96 runner/AudioDBFeatureWriter.cpp \
96 runner/FeatureWriterFactory.cpp \ 97 runner/FeatureWriterFactory.cpp \
97 runner/JAMSFeatureWriter.cpp \ 98 runner/JAMSFeatureWriter.cpp \
99 runner/LabFeatureWriter.cpp \
98 runner/MIDIFeatureWriter.cpp \ 100 runner/MIDIFeatureWriter.cpp \
99 runner/MultiplexedReader.cpp 101 runner/MultiplexedReader.cpp
100 102
101 !win32 { 103 !win32 {
102 QMAKE_POST_LINK=/bin/bash tests/test.sh 104 QMAKE_POST_LINK=/bin/bash tests/test.sh