From 168dd00f72515750505458018767f2ae0bcdb54e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 1 Feb 2017 13:02:47 +0100 Subject: [PATCH] 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) --- src/Make_mvc.mak | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index f1ecbe0b6b..1638fd9b84 100644 --- 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 -!else +!elseif $(MSVCRT_VER) <= 130 MSVCRT_NAME = msvcr$(MSVCRT_VER) +!else +MSVCRT_NAME = vcruntime$(MSVCRT_VER) !endif !if $(MSVC_MAJOR) == 6 diff --git a/src/version.c b/src/version.c index 944dfc9fc6..82ee6d4e65 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 279, /**/ 278, /**/