aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

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

Browse Source 
Problem:    MS-Windows: Win32.mak is no longer needed.
Solution:   Do not include Win32.mak. (Jason McHugh, closes #7290)
This commit is contained in:
Bram Moolenaar
2020-11-14 21:04:33 +01:00
parent a065a14115
commit 6453cc8078
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/INSTALLpc.txt
View File

@@ -264,11 +264,6 @@ For building 64 bit binaries you also need to install the SDK:
"Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1" "Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1"
You don't need the examples and documentation. 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 2. MSYS2 with MinGW
=================== ===================

20
src/Make_mvc.mak
View File

@@ -15,11 +15,7 @@
# This will build the console version of Vim with no additional interfaces. # This will build the console version of Vim with no additional interfaces.
# To add features, define any of the following: # To add features, define any of the following:
# #
# For MSVC 11, if you want to include Win32.mak, you need to specify # !!!! After changing any features do "nmake clean" first !!!!
# 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 !!!!
# #
# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE) # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
# #
@@ -209,9 +205,6 @@ OBJDIR = $(OBJDIR)V
OBJDIR = $(OBJDIR)d OBJDIR = $(OBJDIR)d
!endif !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 !ifdef PROCESSOR_ARCHITECTURE
# We're on Windows NT or using VC 6+ # We're on Windows NT or using VC 6+
! ifdef CPU ! ifdef CPU
@@ -251,18 +244,7 @@ NODEBUG = 1
MAKEFLAGS_GVIMEXT = DEBUG=yes MAKEFLAGS_GVIMEXT = DEBUG=yes
!endif !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 link = link
!endif
# Check VC version. # Check VC version.
!if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul] !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1987,
/**/ /**/
1986, 1986,
/**/ /**/