# HG changeset patch
# User Chris Cannam
# Date 1424881272 0
# Node ID 3404870007c3432954b13a5a951400cfc10e5f3b
# Parent  07c8ee8e1ce85337e2f7f0dec246df930684f6c1
Updates for win32 build - repackaging with Qt5.4 to fix failure to start up properly on 32-bit win8.1

diff -r 07c8ee8e1ce8 -r 3404870007c3 deploy/win32/build.cmd
--- a/deploy/win32/build.cmd	Thu Oct 02 10:29:36 2014 +0100
+++ b/deploy/win32/build.cmd	Wed Feb 25 16:21:12 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 07c8ee8e1ce8 -r 3404870007c3 deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs	Thu Oct 02 10:29:36 2014 +0100
+++ b/deploy/win32/sonic-visualiser.wxs	Wed Feb 25 16:21:12 2015 +0000
@@ -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" />