Skip to content

Commit 6453cc8

Browse files
committed
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 #7290)
1 parent a065a14 commit 6453cc8

3 files changed

Lines changed: 3 additions & 24 deletions

File tree

src/INSTALLpc.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,6 @@ For building 64 bit binaries you also need to install the SDK:
264264
"Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1"
265265
You don't need the examples and documentation.
266266

267-
If you get an error that Win32.mak can't be found, you have to set the
268-
variable SDK_INCLUDE_DIR. For example, on Windows 10, installation of MSVC
269-
puts include files in the following directory:
270-
set SDK_INCLUDE_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.0A\Include
271-
272267

273268
2. MSYS2 with MinGW
274269
===================

src/Make_mvc.mak

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
# This will build the console version of Vim with no additional interfaces.
1616
# To add features, define any of the following:
1717
#
18-
# For MSVC 11, if you want to include Win32.mak, you need to specify
19-
# where the file is, e.g.:
20-
# SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include"
21-
#
22-
# !!!! After changing features do "nmake clean" first !!!!
18+
# !!!! After changing any features do "nmake clean" first !!!!
2319
#
2420
# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
2521
#
@@ -209,9 +205,6 @@ OBJDIR = $(OBJDIR)V
209205
OBJDIR = $(OBJDIR)d
210206
!endif
211207

212-
# If you include Win32.mak, it requires that CPU be set appropriately.
213-
# To cross-compile for Win64, set CPU=AMD64 or CPU=IA64.
214-
215208
!ifdef PROCESSOR_ARCHITECTURE
216209
# We're on Windows NT or using VC 6+
217210
! ifdef CPU
@@ -251,18 +244,7 @@ NODEBUG = 1
251244
MAKEFLAGS_GVIMEXT = DEBUG=yes
252245
!endif
253246

254-
255-
# Get all sorts of useful, standard macros from the Platform SDK,
256-
# if SDK_INCLUDE_DIR is set or USE_WIN32MAK is set to "yes".
257-
258-
!ifdef SDK_INCLUDE_DIR
259-
! include $(SDK_INCLUDE_DIR)\Win32.mak
260-
!elseif "$(USE_WIN32MAK)"=="yes"
261-
! include <Win32.mak>
262-
!else
263247
link = link
264-
!endif
265-
266248

267249
# Check VC version.
268250
!if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
1987,
753755
/**/
754756
1986,
755757
/**/

0 commit comments

Comments
 (0)