Mercurial > hg > sonic-visualiser

changeset 640:6d8a76bd91a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win build fixes from with-dependencies branch
author Chris Cannam
date Tue, 05 Nov 2013 11:11:01 +0000
parents 85834f881360
children 66ef06a6d591
files main/main.cpp sonic-visualiser.pro
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/main.cpp	Tue Nov 05 11:07:55 2013 +0000
+++ b/main/main.cpp	Tue Nov 05 11:11:01 2013 +0000
@@ -257,7 +257,7 @@
     signal(SIGINT,  signalHandler);
     signal(SIGTERM, signalHandler);
 
-#ifndef Q_WS_WIN32
+#ifndef Q_OS_WIN32
     signal(SIGHUP,  signalHandler);
     signal(SIGQUIT, signalHandler);
 #endif
--- a/sonic-visualiser.pro	Tue Nov 05 11:07:55 2013 +0000
+++ b/sonic-visualiser.pro	Tue Nov 05 11:11:01 2013 +0000
@@ -1,5 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore svgui svapp sub_sv #svcore/data/fileio/test
+SUBDIRS = sub_dataquay svcore svgui svapp sub_sv 
+
+!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
+    svcore/data/fileio/test
+}
 
 sub_sv.file = sv.pro