# HG changeset patch # User Bram Moolenaar # Date 1267549184 -3600 # Node ID 8ae4de2d02af315b1c0abc2230c3ccd5a31f1013 # Parent 7d121c69f540272878af6fafdf658443360a698b updated for version 7.2.384 Problem: Vim doesn't build properly with MSVC 2010. Solution: Add the nmake version to the build file. (George Reilly) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -361,6 +361,9 @@ MSVCVER = 9.0 !if "$(_NMAKE_VER)" == "10.00.20506.01" MSVCVER = 10.0 !endif +!if "$(_NMAKE_VER)" == "10.00.30128.01" +MSVCVER = 10.0 +!endif !endif # Abort bulding VIM if version of VC is unrecognised. diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak --- a/src/testdir/Make_dos.mak +++ b/src/testdir/Make_dos.mak @@ -56,6 +56,7 @@ clean: -if exist small.vim del small.vim -if exist tiny.vim del tiny.vim -if exist mbyte.vim del mbyte.vim + -if exist mzscheme.vim del mzscheme.vim -del X* -if exist viminfo del viminfo diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 384, +/**/ 383, /**/ 382,