lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use v142 VC++ runtime merge modules

Browse Source 
* These are optional installs in the new visual studio installer and must be
  specifically selected.
This commit is contained in:
baldurk
2021-02-09 16:30:04 +00:00
parent 9b9fd7e8af
commit 08201d3645
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/installer/Installer32.wxs
+1 -1
View File
@@ -309,7 +309,7 @@
</Directory>
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm"/>
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\v142\MergeModules\Microsoft_VC142_CRT_x86.msm"/>
</DirectoryRef>
<Property Id="VCRT32INSTALLED" Value="0">
util/installer/Installer64.wxs
+2 -2
View File
@@ -334,8 +334,8 @@
</Directory>
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x64.msm"/>
<Merge Id="VCRedist64" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm"/>
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\v142\MergeModules\Microsoft_VC142_CRT_x64.msm"/>
<Merge Id="VCRedist64" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\v142\MergeModules\Microsoft_VC142_CRT_x86.msm"/>
</DirectoryRef>
<Property Id="VCRT64INSTALLED" Value="0">