Patch 8.2.4130

[Bram Moolenaar]

Patch 8.2.4130
Problem: MS-Windows: MSVC build may have libraries duplicated.
Solution: Improve the MSVC Makefile. (Ken Takata, closes #9547)
Files: src/Make_mvc.mak


*** ../vim-8.2.4129/src/Make_mvc.mak 2022-01-13 18:09:08.241764850 +0000
--- src/Make_mvc.mak 2022-01-18 11:34:44.101910452 +0000
***************
*** 508,514 ****
# gdi32.lib and comdlg32.lib for printing support
# ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
! comdlg32.lib ole32.lib netapi32.lib uuid.lib /machine:$(CPU)
!if "$(DELAYLOAD)" == "yes"
CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
!endif
--- 508,515 ----
# gdi32.lib and comdlg32.lib for printing support
# ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
! comdlg32.lib ole32.lib netapi32.lib uuid.lib user32.lib \
! /machine:$(CPU)
!if "$(DELAYLOAD)" == "yes"
CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
!endif
***************
*** 671,676 ****
--- 672,678 ----
!endif

!ifdef NODEBUG
+
VIM = vim
! if "$(OPTIMIZE)" == "SPACE"
OPTFLAG = /O1
***************
*** 701,707 ****
--- 703,711 ----
LIBC = libcmt.lib
CFLAGS = $(CFLAGS) /Zl /MT
! endif
+
!else # DEBUG
+
VIM = vimd
! if ("$(CPU)" == "i386") || ("$(CPU)" == "ix86")
DEBUGINFO = /ZI
***************
*** 721,726 ****
--- 725,731 ----
LIBC = $(LIBC) libcmtd.lib
CFLAGS = $(CFLAGS) /Zl /MTd
! endif
+
!endif # DEBUG

!if "$(CL)" == "/D_USING_V110_SDK71_"
***************
*** 910,918 ****
$(OUTDIR)\gui_beval.obj \
$(OUTDIR)\gui_w32.obj
GUI_LIB = \
! gdi32.lib version.lib $(IME_LIB) \
! winspool.lib comctl32.lib advapi32.lib shell32.lib netapi32.lib \
! /machine:$(CPU)
!else
SUBSYSTEM = console
CUI_INCL = iscygpty.h
--- 915,921 ----
$(OUTDIR)\gui_beval.obj \
$(OUTDIR)\gui_w32.obj
GUI_LIB = \
! version.lib $(IME_LIB) winspool.lib comctl32.lib
!else
SUBSYSTEM = console
CUI_INCL = iscygpty.h
***************
*** 1320,1330 ****
!ENDIF

LINKARGS1 = $(linkdebug) $(conflags)
! LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \
$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
$(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB)

! # Report link time code generation progress if used.
!ifdef NODEBUG
! if $(MSVC_MAJOR) >= 8
! if "$(OPTIMIZE)" != "SPACE"
--- 1323,1333 ----
!ENDIF

LINKARGS1 = $(linkdebug) $(conflags)
! LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \
$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
$(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB)

! # Report link time code generation progress if used.
!ifdef NODEBUG
! if $(MSVC_MAJOR) >= 8
! if "$(OPTIMIZE)" != "SPACE"
*** ../vim-8.2.4129/src/version.c 2022-01-18 11:11:22.297120442 +0000
--- src/version.c 2022-01-18 11:33:50.250014249 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4130,
/**/

--
Q: How does a UNIX Guru pick up a girl?
A: look; grep; which; eval; nice; uname; talk; date;

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///