Mercurial > vim

diff src/Make_mvc.mak @ 27370:584f91cc2508 v8.2.4213

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4213: too much code for supporting old MSVC versions Commit: https://github.com/vim/vim/commit/76687d27173e64d739ea371751697c03ad0821ef Author: K.Takata <kentkt@csc.jp> Date: Tue Jan 25 10:31:37 2022 +0000 patch 8.2.4213: too much code for supporting old MSVC versions Problem: Too much code for supporting old MSVC versions. Solution: Remove MSVC 2003 support. (Ken Takata, closes https://github.com/vim/vim/issues/9623)
author Bram Moolenaar <Bram@vim.org>
date Tue, 25 Jan 2022 11:45:06 +0100
parents d5570658f18d
children 0b1acd38c7de
line wrap: on
line diff
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -305,10 +305,6 @@ MSVCRT_NAME = msvcr$(MSVCRT_VER)
 MSVCRT_NAME = vcruntime$(MSVCRT_VER)
 !endif
 
-!if $(MSVC_MAJOR) == 6
-CPU = ix86
-!endif
-
 ### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET)
 !ifndef WINVER
 WINVER = 0x0501
@@ -707,8 +703,8 @@ RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
 CFLAGS = $(CFLAGS) /MD
 LIBC = msvcrt.lib
 ! else
+CFLAGS = $(CFLAGS) /Zl /MT
 LIBC = libcmt.lib
-CFLAGS = $(CFLAGS) /Zl /MT
 ! endif
 
 !else  # DEBUG
@@ -719,18 +715,14 @@ DEBUGINFO = /ZI
 ! endif
 CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
 RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
-# The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
-! if $(MSVC_MAJOR) == 4
-LIBC =
-! else
+# The /fixed:no is needed for Quantify.
 LIBC = /fixed:no
-! endif
 ! ifdef USE_MSVCRT
 CFLAGS = $(CFLAGS) /MDd
 LIBC = $(LIBC) msvcrtd.lib
 ! else
+CFLAGS = $(CFLAGS) /Zl /MTd
 LIBC = $(LIBC) libcmtd.lib
-CFLAGS = $(CFLAGS) /Zl /MTd
 ! endif
 
 !endif # DEBUG
@@ -799,7 +791,7 @@ OBJ = \
 	$(OUTDIR)\hashtab.obj \
 	$(OUTDIR)\help.obj \
 	$(OUTDIR)\highlight.obj \
-	$(OBJDIR)\if_cscope.obj \
+	$(OUTDIR)\if_cscope.obj \
 	$(OUTDIR)\indent.obj \
 	$(OUTDIR)\insexpand.obj \
 	$(OUTDIR)\json.obj \