| To: vim-dev@vim.org |
| Subject: Patch 7.2.204 (extra) |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| ------------ |
| |
| Patch 7.2.204 (extra) |
| Problem: Win32: Can't build with Visual Studio 2010 beta 1. |
| Solution: Fix the makefile. (George Reilly) |
| Files: src/Make_mvc.mak |
| |
| |
| *** ../vim-7.2.203/src/Make_mvc.mak 2009-05-26 22:58:43.000000000 +0200 |
| --- src/Make_mvc.mak 2009-06-16 16:27:59.000000000 +0200 |
| *************** |
| *** 1,18 **** |
| |
| |
| |
| ! |
| |
| |
| |
| |
| ! |
| |
| ! |
| |
| |
| |
| ! |
| |
| |
| |
| --- 1,18 ---- |
| |
| |
| |
| ! |
| |
| |
| |
| |
| ! |
| |
| ! |
| |
| |
| |
| ! |
| |
| |
| |
| *************** |
| *** 358,363 **** |
| --- 358,366 ---- |
| !if "$(_NMAKE_VER)" == "9.00.30729.01" |
| MSVCVER = 9.0 |
| !endif |
| + !if "$(_NMAKE_VER)" == "10.00.20506.01" |
| + MSVCVER = 10.0 |
| + !endif |
| !endif |
| |
| |
| *************** |
| *** 372,378 **** |
| !endif |
| |
| |
| ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") |
| !if "$(CPUNR)" == "i386" |
| CPUARG = /G3 |
| !elseif "$(CPUNR)" == "i486" |
| --- 375,381 ---- |
| !endif |
| |
| |
| ! !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") |
| !if "$(CPUNR)" == "i386" |
| CPUARG = /G3 |
| !elseif "$(CPUNR)" == "i486" |
| *************** |
| *** 405,411 **** |
| !else |
| OPTFLAG = /Ox |
| !endif |
| ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") |
| |
| !if "$(OPTIMIZE)" != "SPACE" |
| OPTFLAG = $(OPTFLAG) /GL |
| --- 408,414 ---- |
| !else |
| OPTFLAG = /Ox |
| !endif |
| ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") |
| |
| !if "$(OPTIMIZE)" != "SPACE" |
| OPTFLAG = $(OPTFLAG) /GL |
| *************** |
| *** 793,799 **** |
| |
| |
| !ifdef NODEBUG |
| ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") |
| !if "$(OPTIMIZE)" != "SPACE" |
| LINKARGS1 = $(LINKARGS1) /LTCG:STATUS |
| !endif |
| --- 796,802 ---- |
| |
| |
| !ifdef NODEBUG |
| ! !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") |
| !if "$(OPTIMIZE)" != "SPACE" |
| LINKARGS1 = $(LINKARGS1) /LTCG:STATUS |
| !endif |
| *** ../vim-7.2.203/src/version.c 2009-06-16 16:01:34.000000000 +0200 |
| --- src/version.c 2009-06-16 16:32:41.000000000 +0200 |
| *************** |
| *** 678,679 **** |
| --- 678,681 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 204, |
| /**/ |
| |
| -- |
| How To Keep A Healthy Level Of Insanity: |
| 16. Have your coworkers address you by your wrestling name, Rock Hard Kim. |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ download, build and distribute -- http://www.A-A-P.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |