rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Package both release and debug C++ runtimes in debug build

This commit is contained in:
Andrew Nelless 2017-02-09 13:40:44 +00:00
parent ab534cd292
commit 1a62200a56
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/setup/win32/Include.wxi.in
View File

@ -23,8 +23,7 @@
<?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?> <?define OpenSSLPath="$(var.ExtPath)\openssl\windows\$(var.Platform)" ?>
<?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?> <?define OpenSSLBinPath="$(var.OpenSSLPath)\bin" ?>
<?if $(var.Configuration) = "Debug" ?> <?if $(var.Configuration) = "Debug" ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?> <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
<?else ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
<?endif ?> <?endif ?>
<?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
</Include> </Include>

6
src/setup/win32/Product.wxs
View File

@ -15,6 +15,9 @@
<ComponentGroupRef Id="OpenSSLComponents"/> <ComponentGroupRef Id="OpenSSLComponents"/>
<ComponentGroupRef Id="ProductQtPluginComponents"/> <ComponentGroupRef Id="ProductQtPluginComponents"/>
<MergeRef Id="CRT"/> <MergeRef Id="CRT"/>
<?if $(var.Configuration) = "Debug" ?>
<MergeRef Id="DebugCRT"/>
<?endif ?>
<ComponentRef Id="RegistryEntries"/> <ComponentRef Id="RegistryEntries"/>
</Feature> </Feature>
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
@ -49,6 +52,9 @@
<Directory Id="$(var.ProgramFilesFolder)"> <Directory Id="$(var.ProgramFilesFolder)">
<Directory Id="INSTALLFOLDER" Name="$(var.Name)"> <Directory Id="INSTALLFOLDER" Name="$(var.Name)">
<Merge DiskId="1" Id="CRT" Language="0" SourceFile="$(var.CRT)"/> <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="OpenSSLDir" Name="OpenSSL"/>
<Directory Id="PlatformsDir" Name="Platforms"/> <Directory Id="PlatformsDir" Name="Platforms"/>
</Directory> </Directory>