Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

installer: use MSVC2015 runtime. #2531

Merged
merged 1 commit into from Aug 26, 2016

Conversation

@mkrautz
Copy link
Member

commented Aug 24, 2016

No description provided.

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Aug 24, 2016

@hacst ptal

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
a<?xml version="1.0" encoding="utf-8"?>

This comment has been minimized.

Copy link
@mkrautz

mkrautz Aug 24, 2016

Author Member

bad

@mkrautz mkrautz force-pushed the mkrautz:vc14-installer branch 2 times, most recently from 1f9b181 to 1203dd6 Aug 24, 2016

@@ -151,8 +151,8 @@

<?ifdef VersionSubDir ?>
<?ifdef RedistDirVC12 ?>

This comment has been minimized.

Copy link
@hacst

hacst Aug 25, 2016

Member

s/VC12/VC14

<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.RedistDirVC12)\msvcp140.dll" KeyPath="yes" />

This comment has been minimized.

Copy link
@hacst

hacst Aug 25, 2016

Member

*VC14

<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.RedistDirVC12)\vcruntime140.dll" KeyPath="yes" />

This comment has been minimized.

Copy link
@hacst

hacst Aug 25, 2016

Member

*VC14

@hacst

This comment has been minimized.

Copy link
Member

commented Aug 25, 2016

See comments. LGTM apart from that.

@mkrautz mkrautz force-pushed the mkrautz:vc14-installer branch from 1203dd6 to 824db88 Aug 26, 2016

@mkrautz mkrautz merged commit 79f1885 into mumble-voip:master Aug 26, 2016

mkrautz added a commit to mkrautz/mumble that referenced this pull request Sep 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.