Mercurial > hg > sonic-visualiser

changeset 1294:0e0370b84040 project-file-rework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win64 build flags
author Chris Cannam
date Wed, 26 Oct 2016 11:57:13 +0100
parents 7304616053ff
children c234288dddd8
files noconfig.pri
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/noconfig.pri	Tue Oct 25 21:19:48 2016 +0100
+++ b/noconfig.pri	Wed Oct 26 11:57:13 2016 +0100
@@ -68,18 +68,21 @@
     # need to add a way to distinguish the two.
     
     INCLUDEPATH += sv-dependency-builds/win64-msvc/include
-    
-    CONFIG(debug) {
-        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
-            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
-            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
-    }
+
+## This seems to be intruding even when we're supposed to be release
+#    CONFIG(debug) {
+#        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
+#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
+#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
+#    }
     CONFIG(release) {
         LIBS += -Lrelease \
             -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
     }
 
-    DEFINES += NOMINMAX _USE_MATH_DEFINES
+    DEFINES += NOMINMAX _USE_MATH_DEFINES USE_OWN_ALIGNED_MALLOC CAPNP_LITE
+
+    QMAKE_CXXFLAGS_RELEASE += -fp:fast
 
     # No Ogg/FLAC support in the sndfile build on this platform yet
     LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile