# HG changeset patch
# User Chris Cannam
# Date 1423567845 0
# Node ID 08c805e53fc0faf633cea95f9dc00d1d34ac8b63
# Parent  35ce47084c845698f3f4f4fb091b5b0e4aa3f8b7
Updates for next win32 build

diff -r 35ce47084c84 -r 08c805e53fc0 deploy/win32/build.cmd
--- a/deploy/win32/build.cmd	Fri Jan 16 17:02:55 2015 +0000
+++ b/deploy/win32/build.cmd	Tue Feb 10 11:30:45 2015 +0000
@@ -1,7 +1,7 @@
 @ECHO OFF
-SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.8\bin"
+SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.9\bin"
 IF NOT EXIST %WIXPATH% (
-    SET WIXPATH="C:\Program Files\WiX Toolset v3.8\bin"
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.9\bin"
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
diff -r 35ce47084c84 -r 08c805e53fc0 deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs	Fri Jan 16 17:02:55 2015 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Tue Feb 10 11:30:45 2015 +0000
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="2.4"
+      Version="2.5.0"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">
     
@@ -144,20 +144,20 @@
                   DiskId="1"
                   Source="release\Qt5Xml.dll"/>
               <File
-                  Id="icudt52"
-                  Name="icudt52.dll"
+                  Id="icudt53"
+                  Name="icudt53.dll"
                   DiskId="1"
-                  Source="release\icudt52.dll"/>
+                  Source="release\icudt53.dll"/>
               <File
-                  Id="icuin52"
-                  Name="icuin52.dll"
+                  Id="icuin53"
+                  Name="icuin53.dll"
                   DiskId="1"
-                  Source="release\icuin52.dll"/>
+                  Source="release\icuin53.dll"/>
               <File
-                  Id="icuuc52"
-                  Name="icuuc52.dll"
+                  Id="icuuc53"
+                  Name="icuuc53.dll"
                   DiskId="1"
-                  Source="release\icuuc52.dll"/>
+                  Source="release\icuuc53.dll"/>
               <File
                   Id="libgcc"
                   Name="libgcc_s_dw2-1.dll"
@@ -228,8 +228,9 @@
       <UIRef Id="WixUI_InstallDir" />
       <UIRef Id="WixUI_ErrorProgressText" />
     </UI>
-		
+
     <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />
+    <Property Id="WIXUI_DONTVALIDATEPATH" Value="1" />
     <Property Id="ApplicationFolderName" Value="Sonic Visualiser" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />