# HG changeset patch
# User Chris Cannam
# Date 1483904187 0
# Node ID ffad03335920b7dd5012db671a4ffb150d5b7601
# Parent  60d6c21aec8476d279f917b058aeb23c4fa51148
Win64 installer updates

diff -r 60d6c21aec84 -r ffad03335920 deploy/win64/build.cmd
--- a/deploy/win64/build.cmd	Sun Jan 08 16:33:20 2017 +0000
+++ b/deploy/win64/build.cmd	Sun Jan 08 19:36:27 2017 +0000
@@ -5,7 +5,7 @@
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
-%WIXPATH%\light.exe -b ..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MSVC2015_64bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MSVC2015_64bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
 PAUSE
 DEL sonic-visualiser.wixobj
 DEL sonic-visualiser.wixpdb
diff -r 60d6c21aec84 -r ffad03335920 deploy/win64/sonic-visualiser.wxs
--- a/deploy/win64/sonic-visualiser.wxs	Sun Jan 08 16:33:20 2017 +0000
+++ b/deploy/win64/sonic-visualiser.wxs	Sun Jan 08 19:36:27 2017 +0000
@@ -15,9 +15,10 @@
         Description="Sonic Visualiser 64-bit Installer" 
         Comments="Copyright (c) 2017 Queen Mary, University of London and others."
         Manufacturer="Queen Mary, University of London" 
-        InstallerVersion="100" 
+        InstallerVersion="200"
         Languages="1033" 
         Compressed="yes" 
+        Platform="x64"
         SummaryCodepage="1252"/>
 
     <MajorUpgrade DowngradeErrorMessage="A later version of Sonic Visualiser is already installed. Setup will now exit."/>
@@ -27,22 +28,9 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
 
-      <Directory Id="ProgramFilesFolder" Name="PFiles">
-        <Directory Id="VampPlugins" Name="Vamp Plugins">
-          <Component
-              Id="VampPlugins"
-              Guid="E68E4E0B-3C63-49bd-AD2D-44431EABDA6A">
-            <File
-                Id="VampREADME"
-                Name="README.txt"
-                Source="..\sonic-visualiser\deploy\win64\README-Vamp32.txt"/>
-          </Component>
-        </Directory>
-      </Directory> <!-- pfiles -->
-
       <Directory Id="ProgramFiles64Folder" Name="PFiles64">
         <Directory Id="VampPlugins" Name="Vamp Plugins">
-          <Component
+          <Component Win64="yes"
               Id="VampPlugins"
               Guid="528C7D7E-5A06-4E7D-89BB-7C16431DF82F">
             <File
@@ -53,7 +41,7 @@
         </Directory>
 
         <Directory Id="APPLICATIONFOLDER" Name="Sonic Visualiser">
-          <Component
+          <Component Win64="yes"
               Id="MainExecutable"
               Guid="65E1EBDF-4C8F-47B8-BCD6-981667F5946D">
 
@@ -85,23 +73,23 @@
             <File
                 Id="COPYING"
                 Name="COPYING.txt"
-                Source="COPYING"/>
+                Source="..\sonic-visualiser\COPYING"/>
             <File
                 Id="README"
                 Name="README.txt"
-                Source="README"/>
+                Source="..\sonic-visualiser\README"/>
             <File
                 Id="CHANGELOG"
                 Name="CHANGELOG.txt"
-                Source="CHANGELOG"/>
+                Source="..\sonic-visualiser\CHANGELOG"/>
 
             <File
                 Id="winicon.ico"
                 Name="sv-winicon.ico"
-                Source="icons/sv-winicon.ico"/>
+                Source="..\sonic-visualiser\icons\sv-winicon.ico"/>
           </Component>
           
-          <Component
+          <Component Win64="yes"
 	      Id="SVFileAssociation"
 	      Guid="F07C5CC1-0209-4C1A-8D52-C40B50A2B964">
             
@@ -122,7 +110,7 @@
             
           </Component>
           
-          <Component
+          <Component Win64="yes"
               Id="Qt5"
               Guid="5495ED5E-939A-4BE8-9000-D55F2A7A2E90">
             <File
@@ -151,9 +139,41 @@
                 Name="Qt5Svg.dll"
                 Source="release\Qt5Svg.dll"/>
           </Component>
-	  
+
+<Component Win64="yes"
+    Id="Sndfile"
+    Guid="04533516-6460-4155-A0D4-E9BA4D31E95C">
+  <File
+      Id="libsndfile"
+      Name="libsndfile-1.dll"
+      Source="..\sonic-visualiser\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll"
+      KeyPath="yes"/>
+      </Component>
+
+          <Component Win64="yes"
+               Id="VCRuntime"
+               Guid="251D9513-BBD2-47CF-BE78-EF79446F7683">
+               <File
+                   Id="concrt140"
+                   Name="concrt140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\concrt140.DLL"
+                   KeyPath="yes"/>
+               <File
+                   Id="msvcp140"
+                   Name="msvcp140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.DLL"/>
+               <File
+                   Id="vccorlib140"
+                   Name="vccorlib140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vccorlib140.DLL"/>
+               <File
+                   Id="vcruntime140"
+                   Name="vcruntime140.dll"
+                   Source="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\vcruntime140.DLL"/>
+          </Component>
+
 	  <Directory Id="Platforms" Name="platforms">
-            <Component
+            <Component Win64="yes"
                 Id="Qt5PlatformPlugins"
                 Guid="1FFB773E-6D6D-4C0E-832B-F0FFEA959CA5">
 	      <File
@@ -168,7 +188,7 @@
 	  </Directory>
 
 	  <Directory Id="Helpers" Name="helpers">
-            <Component
+            <Component Win64="yes"
                 Id="Piper64"
                 Guid="6385BD86-A5D3-4C77-AD41-B2DCA5B34E48">
 	      <File
@@ -200,7 +220,7 @@
                   Name="libwinpthread-1.dll"
                   Source="release\libwinpthread-1.dll"/>
 	    </Component>
-            <Component
+            <Component Win64="yes"
                 Id="Checker64"
                 Guid="19A400D9-D5B2-4CB5-AF84-7C1DEA11D7B5">
 	      <File
@@ -210,7 +230,7 @@
 	    </Component>
             <Component
                 Id="Checker32"
-                Guid="19A400D9-D5B2-4CB5-AF84-7C1DEA11D7B5">
+                Guid="4F3FDFEC-23BD-4F2F-9B8F-9C8387FDEC21">
 	      <File
 		  Id="checker32"
 		  Name="plugin-checker-helper-32.exe"
@@ -220,7 +240,7 @@
 	  </Directory> <!-- helpers -->
 	</Directory> <!-- sv -->
       </Directory> <!-- pfiles64 -->
-      
+
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="Sonic Visualiser">
           <Component Id="ProgramMenuDir" Guid="C1980FF3-D135-46F8-8542-F937748721E6">
@@ -245,7 +265,9 @@
       <ComponentRef Id="VampPlugins"/>
       <ComponentRef Id="MainExecutable"/>
       <ComponentRef Id="SVFileAssociation"/>
+      <ComponentRef Id="Sndfile"/>
       <ComponentRef Id="Qt5"/>
+      <ComponentRef Id="VCRuntime"/>
       <ComponentRef Id="Qt5PlatformPlugins"/>
       <ComponentRef Id="Piper64"/>
       <ComponentRef Id="Piper32"/>
@@ -265,7 +287,7 @@
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
     <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
     
-    <Icon Id="winicon.ico" SourceFile="icons/sv-winicon.ico"/>
+    <Icon Id="winicon.ico" SourceFile="..\sonic-visualiser\icons\sv-winicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
     
   </Product>