Mercurial > hg > sonic-visualiser

changeset 1295:c234288dddd8 project-file-rework

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More Windows build bits
author Chris Cannam
date Thu, 27 Oct 2016 10:29:44 +0100
parents 0e0370b84040
children e95a46ff8334
files .hgsubstate noconfig.pri
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Oct 26 11:57:13 2016 +0100
+++ b/.hgsubstate	Thu Oct 27 10:29:44 2016 +0100
@@ -4,9 +4,9 @@
 8643d4d1cb14226c72be27e7493597b9a2af526d checker
 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
-def0699cb48ba979e7f403ded29a897c901c5681 piper-cpp
-3ab5a40c4e3bc3dcf9b3037485ea64f64725c607 sv-dependency-builds
+f18dc590b10803e76b77ae25e2a2b4e4aeaa8757 piper-cpp
+e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
 d5e339613174be7acfe20906a347b35c396883b4 svapp
-c0cec465978442022176e95c0c093fbeee285893 svcore
+f350af2b542dacc4848e8c6ef19214e51d08e198 svcore
 8e4b90aeefaa58a1744f0291768ce03e1652f3a1 svgui
 af4a1522ef1585686d3d2d9bc9433588f88f4ccc vamp-plugin-sdk
--- a/noconfig.pri	Wed Oct 26 11:57:13 2016 +0100
+++ b/noconfig.pri	Thu Oct 27 10:29:44 2016 +0100
@@ -49,9 +49,12 @@
     # This config is currently used for 32-bit Windows builds.
 
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
-    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib
 
-    DEFINES += NOMINMAX _USE_MATH_DEFINES
+    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-visualiser/sv-dependency-builds/win32-mingw/lib
+
+    DEFINES += NOMINMAX _USE_MATH_DEFINES USE_OWN_ALIGNED_MALLOC CAPNP_LITE
+
+    QMAKE_CXXFLAGS_RELEASE += -ffast-math
 
     # Don't have liblo
     DEFINES -= HAVE_LIBLO
@@ -105,6 +108,8 @@
     INCLUDEPATH += sv-dependency-builds/osx/include
     LIBS += -Lsv-dependency-builds/osx/lib
 
+    QMAKE_CXXFLAGS_RELEASE += -ffast-math
+
     DEFINES += HAVE_COREAUDIO MALLOC_IS_ALIGNED HAVE_VDSP
     LIBS += \
         -framework CoreAudio \