comparison deploy/win64/sonic-visualiser.wxs @ 1981:30089cc54bac

Update redist locations, + comment
author Chris Cannam
date Mon, 03 Sep 2018 10:27:32 +0100
parents 59895b90c137
children 2b8eaf15ae90
comparison
equal deleted inserted replaced
1980:59895b90c137 1981:30089cc54bac
158 </Component> 158 </Component>
159 159
160 <Component Win64="yes" 160 <Component Win64="yes"
161 Id="VCRuntime" 161 Id="VCRuntime"
162 Guid="251D9513-BBD2-47CF-BE78-EF79446F7683"> 162 Guid="251D9513-BBD2-47CF-BE78-EF79446F7683">
163
164 <!-- Redistributables are handled by the Visual Studio
165 installer (a separate program from VS itself) and are
166 installed into C:\Program Files (x86)\Microsoft
167 Visual Studio\2017\Community\VC\Redist\MSVC\... NB
168 this is not the same thing as the Windows SDKs, which
169 consist of build tools etc - they have their own
170 installers and get installed by default to C:\Program
171 Files (x86)\Windows Kits\... -->
172
163 <File 173 <File
164 Id="concrt140" 174 Id="concrt140"
165 Name="concrt140.dll" 175 Name="concrt140.dll"
166 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\x64\Microsoft.VC141.CRT\concrt140.DLL" 176 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\concrt140.DLL"
167 KeyPath="yes"/> 177 KeyPath="yes"/>
168 <File 178 <File
169 Id="msvcp140" 179 Id="msvcp140"
170 Name="msvcp140.dll" 180 Name="msvcp140.dll"
171 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\x64\Microsoft.VC141.CRT\msvcp140.DLL"/> 181 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\msvcp140.DLL"/>
172 <File 182 <File
173 Id="vccorlib140" 183 Id="vccorlib140"
174 Name="vccorlib140.dll" 184 Name="vccorlib140.dll"
175 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/> 185 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\vccorlib140.DLL"/>
176 <File 186 <File
177 Id="vcruntime140" 187 Id="vcruntime140"
178 Name="vcruntime140.dll" 188 Name="vcruntime140.dll"
179 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.14.26405\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/> 189 Source="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\vcruntime140.DLL"/>
180 </Component> 190 </Component>
181 191
182 <Directory Id="Platforms" Name="platforms"> 192 <Directory Id="Platforms" Name="platforms">
183 <Component Win64="yes" 193 <Component Win64="yes"
184 Id="Qt5PlatformPlugins" 194 Id="Qt5PlatformPlugins"
324 <Property Id="ARPPRODUCTICON" Value="winicon.ico" /> 334 <Property Id="ARPPRODUCTICON" Value="winicon.ico" />
325 335
326 <WixVariable Id="WixUIBannerBmp" Value="..\deploy\win32\top.bmp"/> 336 <WixVariable Id="WixUIBannerBmp" Value="..\deploy\win32\top.bmp"/>
327 <WixVariable Id="WixUIDialogBmp" Value="..\deploy\win32\main.bmp"/> 337 <WixVariable Id="WixUIDialogBmp" Value="..\deploy\win32\main.bmp"/>
328 338
329 </Product> 339 </Product> </Wix>
330 </Wix>
331