Mercurial > hg > tony

changeset 510:a3d73feeb850

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "2.0-integration"
author Chris Cannam
date Mon, 19 Oct 2015 14:17:07 +0100
parents d8013f97df3c (current diff) fcc7e62bfac7 (diff)
children 0ab091a4538f
files
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/bq.pro	Mon Oct 19 11:56:22 2015 +0100
+++ b/bq.pro	Mon Oct 19 14:17:07 2015 +0100
@@ -4,6 +4,7 @@
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
     LIBS += -Lsv-dependency-builds/win32-mingw/lib
+    DEFINES += USE_OWN_ALIGNED_MALLOC
 }
 win32-msvc* {
     INCLUDEPATH += sv-dependency-builds/win32-msvc/include
--- a/deploy/win32/tony.wxs	Mon Oct 19 11:56:22 2015 +0100
+++ b/deploy/win32/tony.wxs	Mon Oct 19 14:17:07 2015 +0100
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="1.0"
+      Version="2.0"
       UpgradeCode="3F073027-A65B-4688-906C-5F64597C5BB1"
       Manufacturer="Queen Mary, University of London">
     
@@ -137,6 +137,11 @@
                 DiskId="1"
                 Source="release\Qt5Network.dll"/>
             <File
+                Id="QtSvg"
+                Name="Qt5Svg.dll"
+                DiskId="1"
+                Source="release\Qt5Svg.dll"/>
+            <File
                 Id="QtWidgets"
                 Name="Qt5Widgets.dll"
                 DiskId="1"
--- a/tonyapp.pro	Mon Oct 19 11:56:22 2015 +0100
+++ b/tonyapp.pro	Mon Oct 19 14:17:07 2015 +0100
@@ -60,7 +60,7 @@
 }
 
 win* {
-MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release $$MY_LIBS
+MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Ldataquay/release -Lrelease $$MY_LIBS
 }
 
 LIBS = $$MY_LIBS $$LIBS