comparison sonic-visualiser.pro @ 568:96a0e169b70f with-dependencies

Merge from default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Tue, 14 May 2013 14:47:30 +0100
parents bf1c6e2b8791 0757db4b5d10
children
comparison
equal deleted inserted replaced
559:881a3f0dd268 568:96a0e169b70f
1 TEMPLATE = subdirs 1 TEMPLATE = subdirs
2 SUBDIRS = dataquay_lib svcore svgui svapp sub_sv 2 SUBDIRS = sub_dataquay svcore svgui svapp sub_sv
3 3
4 !win* { 4 !win* {
5 # We should build and run the tests on any platform, 5 # We should build and run the tests on any platform,
6 # but doing it automatically doesn't work so well from 6 # but doing it automatically doesn't work so well from
7 # within an IDE on Windows, so remove that from here 7 # within an IDE on Windows, so remove that from here
8 SUBDIRS += svcore/data/fileio/test 8 SUBDIRS += svcore/data/fileio/test
9 } 9 }
10 10
11 dataquay_lib.file = dataquay/lib.pro 11 sub_sv.file = sv.pro
12 12
13 sub_sv.file = sv.pro 13 sub_dataquay.file = dataquay/lib.pro
14 14
15 svgui.depends = svcore 15 svgui.depends = svcore
16 svapp.depends = svcore svgui 16 svapp.depends = svcore svgui
17 sub_sv.depends = svcore svgui svapp 17 sub_sv.depends = svcore svgui svapp