# HG changeset patch
# User Chris Cannam
# Date 1570714284 -3600
# Node ID bf5eadde7e7a203df0f1d1b60c7a1d6528346f47
# Parent  446006ea90997cf928e93e20ccda0d32f8c180c9# Parent  82cf7cf4bfefa0195714b24e2ddde6109718cbab
Merge

diff -r 82cf7cf4bfef -r bf5eadde7e7a deploy/win32/build-32.bat
--- a/deploy/win32/build-32.bat	Thu Oct 10 11:06:13 2019 +0100
+++ b/deploy/win32/build-32.bat	Thu Oct 10 14:31:24 2019 +0100
@@ -10,7 +10,7 @@
 )
 
 set ORIGINALPATH=%PATH%
-set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin
+set PATH=C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin;%PATH%
 
 cd %STARTPWD%
 
diff -r 82cf7cf4bfef -r bf5eadde7e7a deploy/win32/sonic-visualiser.wxs
--- a/deploy/win32/sonic-visualiser.wxs	Thu Oct 10 11:06:13 2019 +0100
+++ b/deploy/win32/sonic-visualiser.wxs	Thu Oct 10 14:31:24 2019 +0100
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="3.2"
+      Version="4.0"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">
     
diff -r 82cf7cf4bfef -r bf5eadde7e7a deploy/win64/build-64.bat
--- a/deploy/win64/build-64.bat	Thu Oct 10 11:06:13 2019 +0100
+++ b/deploy/win64/build-64.bat	Thu Oct 10 14:31:24 2019 +0100
@@ -19,7 +19,7 @@
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
 
 set ORIGINALPATH=%PATH%
-set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin
+set PATH=C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;%PATH%
 
 cd %STARTPWD%
 
diff -r 82cf7cf4bfef -r bf5eadde7e7a deploy/win64/sonic-visualiser.wxs
--- a/deploy/win64/sonic-visualiser.wxs	Thu Oct 10 11:06:13 2019 +0100
+++ b/deploy/win64/sonic-visualiser.wxs	Thu Oct 10 14:31:24 2019 +0100
@@ -5,7 +5,7 @@
       Id="*"
       Language="1033"
       Codepage="1252" 
-      Version="3.2"
+      Version="4.0"
       UpgradeCode="D476941E-65F3-4962-9E72-B40FAAE5DBD0"
       Manufacturer="Queen Mary, University of London">