]> granicus.if.org Git - vim/commitdiff
patch 8.0.0279: MSVC 2015 uses a different dll name v8.0.0279
authorBram Moolenaar <Bram@vim.org>
Wed, 1 Feb 2017 12:02:47 +0000 (13:02 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 1 Feb 2017 12:02:47 +0000 (13:02 +0100)
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
src/version.c

index f1ecbe0b6b3ed1a089c302f0dfac3d811460ba1f..1638fd9b844e219ded237a2379d43b16b32671ef 100644 (file)
@@ -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
index 944dfc9fc693a95f451d139681c02e65df6cac8a..82ee6d4e65312cb8f83e9e373dc177a393a0cb8e 100644 (file)
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    279,
 /**/
     278,
 /**/