Mercurial > hg > sonic-visualiser

changeset 1504:49634cb5f558 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More win32 build fixes
author Chris Cannam
date Mon, 09 Jan 2017 14:33:36 +0000
parents 6b8541c01d24
children 298651b1a002 52dd824b5aa9
files deploy/win32/build.cmd deploy/win32/sonic-visualiser.wxs
diffstat 2 files changed, 7 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/win32/build.cmd	Mon Jan 09 14:03:10 2017 +0000
+++ b/deploy/win32/build.cmd	Mon Jan 09 14:33:36 2017 +0000
@@ -5,7 +5,7 @@
 )
 DEL sonic-visualiser.msi
 %WIXPATH%\candle.exe -v sonic-visualiser.wxs
-%WIXPATH%\light.exe -b ..\.. -ext WixUIExtension -v sonic-visualiser.wixobj
+%WIXPATH%\light.exe -b ..\..\..\build-sonic-visualiser-Desktop_Qt_5_7_0_MinGW_32bit-Release -ext WixUIExtension -v sonic-visualiser.wixobj
 PAUSE
 DEL sonic-visualiser.wixobj
 DEL sonic-visualiser.wixpdb
--- a/deploy/win32/sonic-visualiser.wxs	Mon Jan 09 14:03:10 2017 +0000
+++ b/deploy/win32/sonic-visualiser.wxs	Mon Jan 09 14:33:36 2017 +0000
@@ -35,7 +35,7 @@
             <File
                 Id="VampREADME"
                 Name="README.txt"
-                Source="deploy\win32\README-Vamp.txt"/>
+                Source="..\sonic-visualiser\deploy\win32\README-Vamp.txt"/>
           </Component>
         </Directory>
         <Directory Id="APPLICATIONFOLDER" Name="Sonic Visualiser">
@@ -72,20 +72,20 @@
             <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
@@ -138,18 +138,6 @@
                 Name="Qt5Svg.dll"
                 Source="release\Qt5Svg.dll"/>
             <File
-                Id="icudt53"
-                Name="icudt53.dll"
-                Source="release\icudt53.dll"/>
-            <File
-                Id="icuin53"
-                Name="icuin53.dll"
-                Source="release\icuin53.dll"/>
-            <File
-                Id="icuuc53"
-                Name="icuuc53.dll"
-                Source="release\icuuc53.dll"/>
-            <File
                 Id="libgcc"
                 Name="libgcc_s_dw2-1.dll"
                 Source="release\libgcc_s_dw2-1.dll"/>
@@ -255,7 +243,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>