diff deploy/win32/build.cmd @ 642:e3a4831f9c64 imaf_enc

Merge from the default branch
author Chris Cannam
date Tue, 05 Nov 2013 11:17:35 +0000
parents 66ef06a6d591
children 885e89a6c11d
line wrap: on
line diff
--- a/deploy/win32/build.cmd	Mon Nov 04 17:47:53 2013 +0000
+++ b/deploy/win32/build.cmd	Tue Nov 05 11:17:35 2013 +0000
@@ -1,5 +1,8 @@
 @ECHO OFF
 SET WIXPATH="C:\Program Files (x86)\WiX Toolset v3.7\bin"
+IF NOT EXIST %WIXPATH% (
+    SET WIXPATH="C:\Program Files\WiX Toolset v3.7\bin"
+)
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
 %WIXPATH%\light.exe -b ..\.. -ext WixUIExtension -v sonic-visualiser.wixobj