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

Run Visual Studio 2010 C++ redist installer in RenderDoc installation

Browse Source
This commit is contained in:
baldurk
2016-02-17 13:34:21 +01:00
parent bf331422b1
commit c4c0ab8c5b
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/Installer32.wxs
+9 -1
View File
@@ -5,7 +5,7 @@
<Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
Comments='RenderDoc Homepage is http://renderdoc.org/' Manufacturer='Baldur Karlsson'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<UI>
<Error Id="25000">Please use the 64-bit installer</Error>
@@ -246,6 +246,10 @@
</Directory>
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm"/>
</DirectoryRef>
<Feature Id='Complete' Title='RenderDoc' Description='Everything included.' AllowAdvertise='no' Absent='disallow' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title='Program' Description='The main executable with everything needed to capture and replay.' AllowAdvertise='no' Absent='disallow' Level='1'>
<ComponentRef Id='RenderDocUI' />
@@ -267,6 +271,10 @@
<ComponentRef Id='ImageOpenWith' />
</Feature>
<Feature Id="VCRedist32" Title="Visual C++ 2010 Runtime SP1" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist32"/>
</Feature>
<Feature Id='Docs' Title='Documentation' Description='CHM file with local help.' Level='1'>
<ComponentRef Id='Documentation' />
</Feature>
installer/Installer64.wxs
+14 -1
View File
@@ -5,7 +5,7 @@
<Package Id='*' Keywords='Installer' Description="Installer for RenderDoc"
Comments='RenderDoc Homepage is http://renderdoc.org/' Platform="x64" Manufacturer='Baldur Karlsson'
InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallInitialize"/>
@@ -279,6 +279,11 @@
</Directory>
<DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist32" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm"/>
<Merge Id="VCRedist64" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm"/>
</DirectoryRef>
<Feature Id='Complete' Title='RenderDoc' Description='Everything included.' AllowAdvertise='no' Absent='disallow' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
<Feature Id='MainProgram' Title='Program' Description='The main executable with everything needed to capture and replay.' AllowAdvertise='no' Absent='disallow' Level='1'>
<ComponentRef Id='RenderDocUI' />
@@ -306,6 +311,14 @@
</Feature>
<Feature Id="VCRedist32" Title="Visual C++ 2010 Runtime SP1 (x86)" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist32"/>
</Feature>
<Feature Id="VCRedist64" Title="Visual C++ 2010 Runtime SP1 (x64)" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist64"/>
</Feature>
<Feature Id='Docs' Title='Documentation' Description='CHM file with local help.' Level='1'>
<ComponentRef Id='Documentation' />
</Feature>