# HG changeset patch
# User Chris Cannam
# Date 1408013002 -3600
# Node ID 885e89a6c11dd67b53e0ba845a6b7cfeae9162b9
# Parent 60dff961b2b7a4cbd8de91ef0fdb2b0228b69fde
Update for Qt 5.3 and WiX 3.8
diff -r 60dff961b2b7 -r 885e89a6c11d deploy/win32/build.cmd
--- a/deploy/win32/build.cmd Thu Aug 14 09:18:17 2014 +0100
+++ b/deploy/win32/build.cmd Thu Aug 14 11:43:22 2014 +0100
@@ -1,7 +1,7 @@
@ECHO OFF
-SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.7\bin"
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.8\bin"
IF NOT EXIST %WIXPATH% (
- SET WIXPATH="C:\Program Files\WiX Toolset v3.7\bin"
+ SET WIXPATH="C:\Program Files\WiX Toolset v3.8\bin"
)
DEL sonic-visualiser.msi
%WIXPATH%\candle.exe -v sonic-visualiser.wxs
diff -r 60dff961b2b7 -r 885e89a6c11d deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs Thu Aug 14 09:18:17 2014 +0100
+++ b/deploy/win32/sonic-visualiser.wxs Thu Aug 14 11:43:22 2014 +0100
@@ -5,7 +5,7 @@
Id="*"
Language="1033"
Codepage="1252"
- Version="2.3.0"
+ Version="2.3.90"
UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
Manufacturer="Queen Mary, University of London">
@@ -13,7 +13,7 @@
Id="*"
Keywords="Installer"
Description="Sonic Visualiser Installer"
- Comments="Copyright (c) 2013 Queen Mary, University of London and others."
+ Comments="Copyright (c) 2014 Queen Mary, University of London and others."
Manufacturer="Queen Mary, University of London"
InstallerVersion="100"
Languages="1033"
@@ -144,40 +144,25 @@
DiskId="1"
Source="release\Qt5Xml.dll"/>
+ Source="release\icudt52.dll"/>
+ Source="release\icuin52.dll"/>
-
-
+ Source="release\icuuc52.dll"/>
-
+ Source="release\libgcc_s_dw2-1.dll"/>