Mercurial > vim
changeset 12001:fecb0ff6e8cf v8.0.0881
patch 8.0.0881: win32.mak no longer included in Windows SDK
commit https://github.com/vim/vim/commit/e16b00a1582dbff7b76b0631d935531059cf7b47
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 6 17:38:06 2017 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 Aug 2017 17:45:03 +0200 |
| parents | 0adff5d4bc15 |
| children | b2b8f6c69015 |
| files | src/GvimExt/Makefile src/Make_mvc.mak src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -36,8 +36,16 @@ CPU = i386 !ifdef SDK_INCLUDE_DIR !include $(SDK_INCLUDE_DIR)\Win32.mak +!elseif "$(USE_WIN32MAK)"=="yes" +!include <Win32.mak> !else -!include <Win32.mak> +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
--- 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 +!elseif "$(USE_WIN32MAK)"=="yes" +!include <Win32.mak> !else -!include <Win32.mak> +link = link !endif