# 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"/>
               <File
-                  Id="D3DCompiler"
-                  Name="D3DCompiler_43.dll"
+                  Id="icudt52"
+                  Name="icudt52.dll"
                   DiskId="1"
-                  Source="release\D3DCompiler_43.dll"/>
+                  Source="release\icudt52.dll"/>
               <File
-                  Id="icudt49"
-                  Name="icudt49.dll"
+                  Id="icuin52"
+                  Name="icuin52.dll"
                   DiskId="1"
-                  Source="release\icudt49.dll"/>
+                  Source="release\icuin52.dll"/>
               <File
-                  Id="icuin49"
-                  Name="icuin49.dll"
+                  Id="icuuc52"
+                  Name="icuuc52.dll"
                   DiskId="1"
-                  Source="release\icuin49.dll"/>
-              <File
-                  Id="icuuc49"
-                  Name="icuuc49.dll"
-                  DiskId="1"
-                  Source="release\icuuc49.dll"/>
-              <File
-                  Id="libEGL"
-                  Name="libEGL.dll"
-                  DiskId="1"
-                  Source="release\libEGL.dll"/>
+                  Source="release\icuuc52.dll"/>
               <File
                   Id="libgcc"
-                  Name="libgcc_s_sjlj-1.dll"
+                  Name="libgcc_s_dw2-1.dll"
                   DiskId="1"
-                  Source="release\libgcc_s_sjlj-1.dll"/>
-              <File
-                  Id="libGLESv2"
-                  Name="libGLESv2.dll"
-                  DiskId="1"
-                  Source="release\libGLESv2.dll"/>
+                  Source="release\libgcc_s_dw2-1.dll"/>
               <File
                   Id="libstdcplusplus"
                   Name="libstdc++-6.dll"
diff -r 60dff961b2b7 -r 885e89a6c11d sv.pro
--- a/sv.pro	Thu Aug 14 09:18:17 2014 +0100
+++ b/sv.pro	Thu Aug 14 11:43:22 2014 +0100
@@ -1,6 +1,8 @@
 
 TEMPLATE = app
 
+DEFINES += BETA_RELEASE
+
 win32-g++ {
     INCLUDEPATH += sv-dependency-builds/win32-mingw/include
     LIBS += -Lsv-dependency-builds/win32-mingw/lib