patch 8.0.0881: win32.mak no longer included in Windows SDK
Problem: win32.mak no longer included in Windows SDK.
Solution: Do not include win32.mak. (Ken Takata)
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5311ed3..d1221d0 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -15,7 +15,8 @@
# 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.:
+# For MSVC 11, if you want to include Win32.mak, you need to specify
+# where the file is, e.g.:
# SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include"
#
# !!!! After changing features do "nmake clean" first !!!!
@@ -212,7 +213,7 @@
OBJDIR = $(OBJDIR)d
!endif
-# Win32.mak requires that CPU be set appropriately.
+# If you include Win32.mak, it requires that CPU be set appropriately.
# To cross-compile for Win64, set CPU=AMD64 or CPU=IA64.
!ifdef PROCESSOR_ARCHITECTURE
@@ -253,12 +254,15 @@
!endif
-# Get all sorts of useful, standard macros from the Platform SDK.
+# Get all sorts of useful, standard macros from the Platform SDK,
+# if SDK_INCLUDE_DIR is set or USE_WIN32MAK is set to "yes".
!ifdef SDK_INCLUDE_DIR
!include $(SDK_INCLUDE_DIR)\Win32.mak
-!else
+!elseif "$(USE_WIN32MAK)"=="yes"
!include <Win32.mak>
+!else
+link = link
!endif