Mercurial > vim

comparison src/Make_mvc.mak @ 3814:35939e1e25ff v7.3.665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.665 Problem: MSVC 11 is not supported. Solution: Recognize MSVC 11. (Raymond Ko)
author Bram Moolenaar <bram@vim.org>
date Tue, 18 Sep 2012 18:27:12 +0200
parents fd0c7452fa51
children 1e22adc6176e
comparison
equal deleted inserted replaced
3813:d979db245f57 3814:35939e1e25ff
393 MSVCVER = 10.0 393 MSVCVER = 10.0
394 !endif 394 !endif
395 !if "$(_NMAKE_VER)" == "10.00.30319.01" 395 !if "$(_NMAKE_VER)" == "10.00.30319.01"
396 MSVCVER = 10.0 396 MSVCVER = 10.0
397 !endif 397 !endif
398 !if "$(_NMAKE_VER)" == "11.00.50727.1"
399 MSVCVER = 11.0
400 !endif
398 !endif 401 !endif
399 402
400 # Abort bulding VIM if version of VC is unrecognised. 403 # Abort bulding VIM if version of VC is unrecognised.
401 !ifndef MSVCVER 404 !ifndef MSVCVER
402 !message *** ERROR 405 !message *** ERROR
407 !message to handle the new value for _NMAKE_VER, "$(_NMAKE_VER)". 410 !message to handle the new value for _NMAKE_VER, "$(_NMAKE_VER)".
408 !error Make aborted. 411 !error Make aborted.
409 !endif 412 !endif
410 413
411 # Convert processor ID to MVC-compatible number 414 # Convert processor ID to MVC-compatible number
412 !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") 415 !if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0")
413 !if "$(CPUNR)" == "i386" 416 !if "$(CPUNR)" == "i386"
414 CPUARG = /G3 417 CPUARG = /G3
415 !elseif "$(CPUNR)" == "i486" 418 !elseif "$(CPUNR)" == "i486"
416 CPUARG = /G4 419 CPUARG = /G4
417 !elseif "$(CPUNR)" == "i586" 420 !elseif "$(CPUNR)" == "i586"
441 OPTFLAG = /O2 444 OPTFLAG = /O2
442 !else # MAXSPEED 445 !else # MAXSPEED
443 OPTFLAG = /Ox 446 OPTFLAG = /Ox
444 !endif 447 !endif
445 448
446 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") 449 !if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
447 # Use link time code generation if not worried about size 450 # Use link time code generation if not worried about size
448 !if "$(OPTIMIZE)" != "SPACE" 451 !if "$(OPTIMIZE)" != "SPACE"
449 OPTFLAG = $(OPTFLAG) /GL 452 OPTFLAG = $(OPTFLAG) /GL
450 !endif 453 !endif
451 !endif 454 !endif