diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-08-27 00:39:24 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-08-27 00:39:24 +0300 |
| commit | 824db88b74aa6ee08aa2a27e9ea963169a7afc88 (patch) | |
| tree | e41d082737753f6ed5ac3650ec6f70486532da17 /installer | |
| parent | 355bf07c4389fc3088468039f939b47b5d1fd85c (diff) | |
installer: use MSVC2015 runtime.
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Files.wxs | 20 | ||||
| -rw-r--r-- | installer/Product.wxs | 12 | ||||
| -rw-r--r-- | installer/Settings.wxi | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs index 3e68f0253..f315e1891 100644 --- a/installer/Files.wxs +++ b/installer/Files.wxs @@ -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"> diff --git a/installer/Product.wxs b/installer/Product.wxs index dd374ab64..d166a2199 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -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 ?> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index 8d089c57e..2347ef269 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -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 ?> |