Mercurial > vim

changeset 10779:9b2073149118 v8.0.0279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0279: MSVC 2015 uses a different dll name commit https://github.com/vim/vim/commit/168dd00f72515750505458018767f2ae0bcdb54e Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 1 13:02:47 2017 +0100 patch 8.0.0279: MSVC 2015 uses a different dll name Problem: With MSVC 2015 the dll name is vcruntime140.dll. Solution: Check the MSVC version and use the right dll name. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Wed, 01 Feb 2017 13:15:05 +0100
parents e8b12aefdc77
children e2efe20f1f8c
files src/Make_mvc.mak src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -285,8 +285,10 @@ MSVCRT_VER = ($(MSVCVER) / 10 - 50)
 # Base name of the msvcrXX.dll
 !if $(MSVCRT_VER) <= 60
 MSVCRT_NAME = msvcrt
+!elseif $(MSVCRT_VER) <= 130
+MSVCRT_NAME = msvcr$(MSVCRT_VER)
 !else
-MSVCRT_NAME = msvcr$(MSVCRT_VER)
+MSVCRT_NAME = vcruntime$(MSVCRT_VER)
 !endif
 
 !if $(MSVC_MAJOR) == 6
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    279,
+/**/
     278,
 /**/
     277,