Mercurial > hg > sonic-annotator
changeset 85:dcd7abe066d5 with-dependencies
Win32 build fixes
| author | Chris Cannam <chris.cannam@eecs.qmul.ac.uk> |
|---|---|
| date | Thu, 09 May 2013 13:32:35 +0100 |
| parents | e15f291f3500 |
| children | c82736e79739 |
| files | .hgsubstate platform-dataquay.pri runner.pro sonic-annotator.pro |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Thu May 09 11:01:12 2013 +0100 +++ b/.hgsubstate Thu May 09 13:32:35 2013 +0100 @@ -1,3 +1,3 @@ 1618ab0f5e89bb6a0c6242bea545fe76a5fcd755 dataquay 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds -c808c57e556048f4e9bdffa09cee691cd73b6466 svcore +9207c142b461b2ed347a16a1b7da49751257f8f6 svcore
--- a/platform-dataquay.pri Thu May 09 11:01:12 2013 +0100 +++ b/platform-dataquay.pri Thu May 09 13:32:35 2013 +0100 @@ -1,5 +1,7 @@ -include(./config.pri) +exists(./config.pri) { + include(./config.pri) +} CONFIG += staticlib
--- a/runner.pro Thu May 09 11:01:12 2013 +0100 +++ b/runner.pro Thu May 09 13:32:35 2013 +0100 @@ -55,9 +55,13 @@ MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic } +win* { +MY_LIBS = -Lsvcore/release -Ldataquay/release $$MY_LIBS +} + LIBS = $$MY_LIBS $$LIBS -PRE_TARGETDEPS += svcore/libsvcore.a +#PRE_TARGETDEPS += svcore/libsvcore.a HEADERS += \ runner/AudioDBFeatureWriter.h \
--- a/sonic-annotator.pro Thu May 09 11:01:12 2013 +0100 +++ b/sonic-annotator.pro Thu May 09 13:32:35 2013 +0100 @@ -1,5 +1,12 @@ TEMPLATE = subdirs -SUBDIRS = sub_dataquay svcore svcore/data/fileio/test sub_runner +SUBDIRS = sub_dataquay svcore sub_runner + +!win* { + # We should build and run the tests on any platform, + # but doing it automatically doesn't work so well from + # within an IDE on Windows, so remove that from here + SUBDIRS += svcore/data/fileio/test +} sub_dataquay.file = dataquay/lib.pro