Mercurial > vim

comparison src/Make_mvc.mak @ 12001:fecb0ff6e8cf v8.0.0881

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 24a3bec6e317
children b9b06aa0b6d9
comparison
equal deleted inserted replaced
12000:0adff5d4bc15 12001:fecb0ff6e8cf
13 # nmake -f Make_mvc.mak 13 # nmake -f Make_mvc.mak
14 # 14 #
15 # This will build the console version of Vim with no additional interfaces. 15 # This will build the console version of Vim with no additional interfaces.
16 # To add features, define any of the following: 16 # To add features, define any of the following:
17 # 17 #
18 # For MSVC 11 you need to specify where the Win32.mak file is, e.g.: 18 # For MSVC 11, if you want to include Win32.mak, you need to specify
19 # where the file is, e.g.:
19 # SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include" 20 # SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include"
20 # 21 #
21 # !!!! After changing features do "nmake clean" first !!!! 22 # !!!! After changing features do "nmake clean" first !!!!
22 # 23 #
23 # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE) 24 # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE)
210 !endif 211 !endif
211 !if "$(DEBUG)" == "yes" 212 !if "$(DEBUG)" == "yes"
212 OBJDIR = $(OBJDIR)d 213 OBJDIR = $(OBJDIR)d
213 !endif 214 !endif
214 215
215 # Win32.mak requires that CPU be set appropriately. 216 # If you include Win32.mak, it requires that CPU be set appropriately.
216 # To cross-compile for Win64, set CPU=AMD64 or CPU=IA64. 217 # To cross-compile for Win64, set CPU=AMD64 or CPU=IA64.
217 218
218 !ifdef PROCESSOR_ARCHITECTURE 219 !ifdef PROCESSOR_ARCHITECTURE
219 # We're on Windows NT or using VC 6+ 220 # We're on Windows NT or using VC 6+
220 ! ifdef CPU 221 ! ifdef CPU
251 !undef NODEBUG 252 !undef NODEBUG
252 MAKEFLAGS_GVIMEXT = DEBUG=yes 253 MAKEFLAGS_GVIMEXT = DEBUG=yes
253 !endif 254 !endif
254 255
255 256
256 # Get all sorts of useful, standard macros from the Platform SDK. 257 # Get all sorts of useful, standard macros from the Platform SDK,
258 # if SDK_INCLUDE_DIR is set or USE_WIN32MAK is set to "yes".
257 259
258 !ifdef SDK_INCLUDE_DIR 260 !ifdef SDK_INCLUDE_DIR
259 !include $(SDK_INCLUDE_DIR)\Win32.mak 261 !include $(SDK_INCLUDE_DIR)\Win32.mak
260 !else 262 !elseif "$(USE_WIN32MAK)"=="yes"
261 !include <Win32.mak> 263 !include <Win32.mak>
264 !else
265 link = link
262 !endif 266 !endif
263 267
264 268
265 # Check VC version. 269 # Check VC version.
266 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul] 270 !if [echo MSVCVER=_MSC_VER> msvcver.c && $(CC) /EP msvcver.c > msvcver.~ 2> nul]