thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1474: Visual C 2017 has multiple MSVCVER numbers

Browse Source 
Problem:    Visual C 2017 has multiple MSVCVER numbers.
Solution:   Assume the 2017 version if MSVCVER >= 1910. (Leonardo Valeri
            Manera, closes #2619)
This commit is contained in:
Bram Moolenaar
2018-02-06 22:02:43 +01:00
parent 511ffdd65d
commit dd08b6a32b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Make_mvc.mak
View File

@@ -289,7 +289,8 @@ MSVC_MAJOR = ($(MSVCVER) / 100 - 6)
MSVCRT_VER = ($(MSVCVER) / 10 - 60) MSVCRT_VER = ($(MSVCVER) / 10 - 60)
# Visual C++ 2017 needs special handling # Visual C++ 2017 needs special handling
# it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140 # it has an _MSC_VER of 1910->14.1, but is actually v15 with runtime v140
!elseif $(MSVCVER) == 1910 # TODO: what's the maximum value?
!elseif $(MSVCVER) >= 1910
MSVC_MAJOR = 15 MSVC_MAJOR = 15
MSVCRT_VER = 140 MSVCRT_VER = 140
!else !else

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1474,
/**/ /**/
1473, 1473,
/**/ /**/