From 1a62200a56e515b4150e0035df2c693a4f05eb33 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Thu, 9 Feb 2017 13:40:44 +0000
Subject: [PATCH] Package both release and debug C++ runtimes in debug build

---
 src/setup/win32/Include.wxi.in | 5 ++---
 src/setup/win32/Product.wxs    | 6 ++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/setup/win32/Include.wxi.in b/src/setup/win32/Include.wxi.in
index a9448406..6641bc0b 100644
--- a/src/setup/win32/Include.wxi.in
+++ b/src/setup/win32/Include.wxi.in
@@ -23,8 +23,7 @@
     <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
     <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
     <?if $(var.Configuration) = "Debug" ?>
-        <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
-    <?else ?>
-        <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
+        <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
     <?endif ?>
+    <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
 </Include>
\ No newline at end of file
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index 69d54635..c30f9a71 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -15,6 +15,9 @@
 			<ComponentGroupRef Id="OpenSSLComponents"/>
 			<ComponentGroupRef Id="ProductQtPluginComponents"/>
 			<MergeRef Id="CRT"/>
+            <?if $(var.Configuration) = "Debug" ?>
+			    <MergeRef Id="DebugCRT"/>
+	        <?endif ?>
 			<ComponentRef Id="RegistryEntries"/>
 		</Feature>
 		<DirectoryRef Id="TARGETDIR">
@@ -49,6 +52,9 @@
 			<Directory Id="$(var.ProgramFilesFolder)">
 				<Directory Id="INSTALLFOLDER" Name="$(var.Name)">
 					<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/>
+					<?if $(var.Configuration) = "Debug" ?>
+					    <Merge DiskId="1" Id="DebugCRT" Language="0" SourceFile="$(var.DebugCRT)"/>
+				    <?endif ?>
 					<Directory Id="OpenSSLDir" Name="OpenSSL"/>
 					<Directory Id="PlatformsDir" Name="Platforms"/>
 				</Directory>