summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-06 17:38:06 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-06 17:38:06 +0200
commite16b00a1582dbff7b76b0631d935531059cf7b47 (patch)
tree426f74c3837b6c8b14599beafc2245cdaa20d229 /src
parent02113ed4dfa585b4553a7c630b4d7eed0002aebd (diff)
downloadvim-git-e16b00a1582dbff7b76b0631d935531059cf7b47.tar.gz
patch 8.0.0881: win32.mak no longer included in Windows SDKv8.0.0881
Problem: win32.mak no longer included in Windows SDK. Solution: Do not include win32.mak. (Ken Takata)
Diffstat (limited to 'src')
-rw-r--r--src/GvimExt/Makefile10
-rw-r--r--src/Make_mvc.mak12
-rw-r--r--src/version.c2
3 files changed, 19 insertions, 5 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile
index 043d37da2..c681d3352 100644
--- 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 5311ed3e8..d1221d0f0 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)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 19e2a0d5c..2b489ff17 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 881,
+/**/
880,
/**/
879,