Patch 8.2.1987
Problem: MS-Windows: Win32.mak is no longer needed.
Solution: Do not include Win32.mak. (Jason McHugh, closes #7290)
Files: src/Make_mvc.mak, src/INSTALLpc.txt
*** ../vim-8.2.1986/src/Make_mvc.mak 2020-09-05 15:48:32.465546702 +0200
--- src/Make_mvc.mak 2020-11-14 21:01:34.913604827 +0100
***************
*** 15,25 ****
# 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 !!!!
#
# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
#
--- 15,21 ----
# This will build the console version of Vim with no additional interfaces.
# To add features, define any of the following:
#
! # !!!! After changing any features do "nmake clean" first !!!!
#
# Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
#
***************
*** 209,217 ****
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
--- 205,210 ----
***************
*** 251,268 ****
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]
--- 244,250 ----
*** ../vim-8.2.1986/src/INSTALLpc.txt 2019-11-19 22:56:46.000000000 +0100
--- src/INSTALLpc.txt 2020-11-14 21:02:07.873540984 +0100
***************
*** 265,275 ****
"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
===================
--- 264,269 ----
*** ../vim-8.2.1986/src/version.c 2020-11-14 20:57:03.866109771 +0100
--- src/version.c 2020-11-14 21:03:15.617408471 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 1987,
/**/
--
Hear about the guy who played a blank tape at full blast?
The mime next door went nuts.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202011142006.0AEK6A8E692755%40masaka.moolenaar.net.
