# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1605384903 -3600
# Node ID a9292e0a7157609bf51bacfdda16cb13c26a424d
# Parent  9ad040404f2b2c81a845a7b63f8b304b28b3e797
patch 8.2.1987: MS-Windows: Win32.mak is no longer needed

Commit: https://github.com/vim/vim/commit/6453cc8078af403956d0e8c1849cf5ec0aae86b2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Nov 14 21:04:33 2020 +0100

    patch 8.2.1987: MS-Windows: Win32.mak is no longer needed

    Problem:    MS-Windows: Win32.mak is no longer needed.
    Solution:   Do not include Win32.mak. (Jason McHugh, closes https://github.com/vim/vim/issues/7290)

diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -264,11 +264,6 @@ For building 64 bit binaries you also ne
 "Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1"
 You don't need the examples and documentation.
 
-If you get an error that Win32.mak can't be found, you have to set the
-variable SDK_INCLUDE_DIR.  For example, on Windows 10, installation of MSVC
-puts include files in the following directory:
-    set SDK_INCLUDE_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include
-
 
 2. MSYS2 with MinGW
 ===================
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -15,11 +15,7 @@
 # This will build the console version of Vim with no additional interfaces.
 # To add features, define any of the following:
 #
-# 	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  !!!!
+#	!!!!  After changing any features do "nmake clean" first  !!!!
 #
 #	Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
 #
@@ -209,9 +205,6 @@ OBJDIR = $(OBJDIR)V
 OBJDIR = $(OBJDIR)d
 !endif
 
-# 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
 # We're on Windows NT or using VC 6+
 ! ifdef CPU
@@ -251,18 +244,7 @@ NODEBUG = 1
 MAKEFLAGS_GVIMEXT = DEBUG=yes
 !endif
 
-
-# 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
-!elseif "$(USE_WIN32MAK)"=="yes"
-! include <Win32.mak>
-!else
 link = link
-!endif
-
 
 # Check VC version.
 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1987,
+/**/
     1986,
 /**/
     1985,