projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.384 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.384 (extra) | |
| 11 | Problem: Vim doesn't build properly with MSVC 2010. | |
| 12 | Solution: Add the nmake version to the build file. (George Reilly) | |
| 13 | Files: src/Make_mvc.mak, src/testdir/Make_dos.mak | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.383/src/Make_mvc.mak 2009-09-11 12:48:56.000000000 +0200 | |
| 17 | --- src/Make_mvc.mak 2010-03-02 17:44:22.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 361,366 **** | |
| 20 | --- 361,369 ---- | |
| 21 | !if "$(_NMAKE_VER)" == "10.00.20506.01" | |
| 22 | MSVCVER = 10.0 | |
| 23 | !endif | |
| 24 | + !if "$(_NMAKE_VER)" == "10.00.30128.01" | |
| 25 | + MSVCVER = 10.0 | |
| 26 | + !endif | |
| 27 | !endif | |
| 28 | ||
| 29 | # Abort bulding VIM if version of VC is unrecognised. | |
| 30 | *** ../vim-7.2.383/src/testdir/Make_dos.mak 2010-01-19 15:51:29.000000000 +0100 | |
| 31 | --- src/testdir/Make_dos.mak 2010-03-02 17:45:48.000000000 +0100 | |
| 32 | *************** | |
| 33 | *** 56,61 **** | |
| 34 | --- 56,62 ---- | |
| 35 | -if exist small.vim del small.vim | |
| 36 | -if exist tiny.vim del tiny.vim | |
| 37 | -if exist mbyte.vim del mbyte.vim | |
| 38 | + -if exist mzscheme.vim del mzscheme.vim | |
| 39 | -del X* | |
| 40 | -if exist viminfo del viminfo | |
| 41 | ||
| 42 | *** ../vim-7.2.383/src/version.c 2010-03-02 17:50:30.000000000 +0100 | |
| 43 | --- src/version.c 2010-03-02 17:59:09.000000000 +0100 | |
| 44 | *************** | |
| 45 | *** 683,684 **** | |
| 46 | --- 683,686 ---- | |
| 47 | { /* Add new patch number below this line */ | |
| 48 | + /**/ | |
| 49 | + 384, | |
| 50 | /**/ | |
| 51 | ||
| 52 | -- | |
| 53 | Yah, well, we had to carve our electrons out of driftwood we'd | |
| 54 | find. In the winter. Uphill. Both ways. | |
| 55 | ||
| 56 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 57 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 58 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 59 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |