Mercurial > vim
diff src/Make_mvc.mak @ 3816:1e22adc6176e v7.3.666
updated for version 7.3.666
Problem: With MSVC 11 Win32.mak is not found.
Solution: Add the SDK_INCLUDE_DIR variable. (Raymond Ko)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 18 Sep 2012 22:00:08 +0200 |
| parents | 35939e1e25ff |
| children | 916b5c11a13e |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1,7 +1,7 @@ # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me) # and Win64, using the Microsoft Visual C++ compilers. Known to work with # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005), -# VC9 (VS2008), and VC10 (VS2010). +# VC9 (VS2008), VC10 (VS2010) and VC11 (VS2012) # # To build using other Windows compilers, see INSTALLpc.txt # @@ -15,6 +15,9 @@ # This will build the console version of Vim with no additional interfaces. # To add features, define any of the following: # +# For MSVC 11 you need to specify where the Win32.mak file is, e.g.: +# SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include" +# # !!!! After changing features do "nmake clean" first !!!! # # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG) @@ -227,7 +230,12 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes # Get all sorts of useful, standard macros from the Platform SDK. +!ifdef SDK_INCLUDE_DIR +!include $(SDK_INCLUDE_DIR)\Win32.mak +!else !include <Win32.mak> +!endif + # Flag to turn on Win64 compatibility warnings for VC7.x and VC8. WP64CHECK = /Wp64 @@ -911,7 +919,7 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC # Report link time code generation progress if used. !ifdef NODEBUG -!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") +!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0") !if "$(OPTIMIZE)" != "SPACE" LINKARGS1 = $(LINKARGS1) /LTCG:STATUS !endif