From c4c0ab8c5b361b8e4d58407205804aa74f1345f8 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 17 Feb 2016 13:34:21 +0100
Subject: [PATCH] Run Visual Studio 2010 C++ redist installer in RenderDoc
 installation

---
 installer/Installer32.wxs | 10 +++++++++-
 installer/Installer64.wxs | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/installer/Installer32.wxs b/installer/Installer32.wxs
index babc09295..ff1fad922 100644
--- a/installer/Installer32.wxs
+++ b/installer/Installer32.wxs
@@ -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>
diff --git a/installer/Installer64.wxs b/installer/Installer64.wxs
index fbaa8994e..0f1936c6b 100644
--- a/installer/Installer64.wxs
+++ b/installer/Installer64.wxs
@@ -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>