diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-02 17:59:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-02 17:59:44 +0100 |
| commit | 2498b3ab108a99f125e756ac46bf2629ceb23c25 (patch) | |
| tree | 9ed062051ea6fbb72c840c542e3e6146326faa46 | |
| parent | 8b9c05fa5416bd35597a4fbe83f811d4f6d068d7 (diff) | |
| download | vim-git-2498b3ab108a99f125e756ac46bf2629ceb23c25.tar.gz | |
updated for version 7.2.384v7.2.384
Problem: Vim doesn't build properly with MSVC 2010.
Solution: Add the nmake version to the build file. (George Reilly)
| -rw-r--r-- | src/Make_mvc.mak | 3 | ||||
| -rw-r--r-- | src/testdir/Make_dos.mak | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 15a14ade1..38ced6e5c 100644 --- 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 index 29f8b8687..8f35c7bd1 100644 --- 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 index 80a48f64a..f4eaa93e6 100644 --- 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, |