Skip to content
Permalink
Browse files

Merge PR #2531: installer: use MSVC2015 runtime.

  • Loading branch information...
mkrautz committed Aug 26, 2016
2 parents c05d4de + 824db88 commit 79f18853909e28da74d312e8284d508aa9cbce9c
Showing with 20 additions and 20 deletions.
  1. +10 −10 installer/Files.wxs
  2. +6 −6 installer/Product.wxs
  3. +4 −4 installer/Settings.wxi
@@ -66,12 +66,12 @@
</Component>
<?endif ?>

<?ifdef RedistDirVC12 ?>
<Component Id="msvcp120.dll">
<File Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />
<?ifdef RedistDirVC14 ?>
<Component Id="msvcp140.dll">
<File Source="$(var.RedistDirVC14)\msvcp140.dll" KeyPath="yes" />
</Component>
<Component Id="msvcr120.dll">
<File Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" />
<Component Id="vcruntime140.dll">
<File Source="$(var.RedistDirVC14)\vcruntime140.dll" KeyPath="yes" />
</Component>
<?endif ?>

@@ -135,12 +135,12 @@
</Component>

<?ifdef VersionSubDir ?>
<?ifdef RedistDirVC12 ?>
<Component Id="Murmur_msvcp120.dll">
<File Id="Murmur_msvcp120.dll" Source="$(var.RedistDirVC12)\msvcp120.dll" KeyPath="yes" />
<?ifdef RedistDirVC14 ?>
<Component Id="Murmur_msvcp140.dll">
<File Id="Murmur_msvcp140.dll" Source="$(var.RedistDirVC14)\msvcp140.dll" KeyPath="yes" />
</Component>
<Component Id="Murmur_msvcr120.dll">
<File Id="Murmur_msvcr120.dll" Source="$(var.RedistDirVC12)\msvcr120.dll" KeyPath="yes" />
<Component Id="Murmur_vcruntime140.dll">
<File Id="Murmur_vcruntime140.dll" Source="$(var.RedistDirVC14)\vcruntime140.dll" KeyPath="yes" />
</Component>
<?endif ?>
<Component Id="Murmur_dbghelp.dll">
@@ -132,9 +132,9 @@
<ComponentRef Id="mumble_g15_helper.exe" />
<?endif ?>

<?ifdef RedistDirVC12 ?>
<ComponentRef Id="msvcp120.dll" />
<ComponentRef Id="msvcr120.dll" />
<?ifdef RedistDirVC14 ?>
<ComponentRef Id="msvcp140.dll" />
<ComponentRef Id="vcruntime140.dll" />
<?endif ?>

<ComponentRef Id="dbghelp.dll" />
@@ -150,9 +150,9 @@
<ComponentRef Id="Murmur.ice" />

<?ifdef VersionSubDir ?>
<?ifdef RedistDirVC12 ?>
<ComponentRef Id="Murmur_msvcp120.dll" />
<ComponentRef Id="Murmur_msvcr120.dll" />
<?ifdef RedistDirVC14 ?>
<ComponentRef Id="Murmur_msvcp140.dll" />
<ComponentRef Id="Murmur_vcruntime140.dll" />
<?endif ?>
<ComponentRef Id="Murmur_dbghelp.dll" />
<?endif ?>
@@ -92,14 +92,14 @@

<!-- Don't embed VCRedist files if MumbleNoEmbedVCRedist env var is set. -->
<?ifndef env.MumbleNoEmbedVCRedist ?>
<?ifndef env.MumbleRedistDirVC12 ?>
<?ifndef env.MumbleRedistDirVC14 ?>
<?if $(sys.BUILDARCH) = "x86" ?>
<?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT" ?>
<?define RedistDirVC14 = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT" ?>
<?elseif $(sys.BUILDARCH) = "x64" ?>
<?define RedistDirVC12 = "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x64\Microsoft.VC120.CRT" ?>
<?define RedistDirVC14 = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT" ?>
<?endif ?>
<?else ?>
<?define RedistDirVC12 = "$(env.MumbleRedistDirVC12)" ?>
<?define RedistDirVC14 = "$(env.MumbleRedistDirVC14)" ?>
<?endif ?>
<?endif ?>

0 comments on commit 79f1885

Please sign in to comment.
You can’t perform that action at this time.