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/GvimExt/Makefile b/src/GvimExt/Makefile
index 043d37da2cebd74d4ef7e5279e382a7fe9ad6fd1..c681d33528d5a1b189961138845cb9c601fa8db5 100644 (file)
--- a/src/GvimExt/Makefile
+++ b/src/GvimExt/Makefile
@@ -36,8 +36,16 @@ CPU = i386
 
 !ifdef SDK_INCLUDE_DIR
 !include $(SDK_INCLUDE_DIR)\Win32.mak
-!else
+!elseif "$(USE_WIN32MAK)"=="yes"
 !include <Win32.mak>
+!else
+cc = cl
+link = link
+rc = rc
+cflags = -nologo -c
+lflags = -incremental:no -nologo
+rcflags = /r
+olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib
 !endif
 
 # include CPUARG

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5311ed3e8a016dae1e6b4d9fbbfed57f23609252..d1221d0f0a22debe606f3fea6016bf8e22a8582d 100644 (file)
--- 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)Z
 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 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes
 !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
 
 

diff --git a/src/version.c b/src/version.c
index 19e2a0d5c3d29d124aaf141b4374c029774da801..2b489ff17398bf7c71f96298310accec127315a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    881,
 /**/
     880,
 /**/