diff options
| author | K.Takata <kentkt@csc.jp> | 2022-01-18 11:34:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-18 11:34:57 +0000 |
| commit | 31dcc8de463843e3378bb15a16247940d6a147e4 (patch) | |
| tree | b98c6a1d3d04b5a8f427f798cf88a0eb57e99ba6 /src/Make_mvc.mak | |
| parent | 1247126956c2ba666048b2bf99630eef7495e98e (diff) | |
patch 8.2.4130: MS-Windows: MSVC build may have libraries duplicatedv8.2.4130
Problem: MS-Windows: MSVC build may have libraries duplicated.
Solution: Improve the MSVC Makefile. (Ken Takata, closes #9547)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 0f6f676c49..b33d24b1ab 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -508,7 +508,8 @@ NETBEANS_LIB = WSock32.lib Ws2_32.lib # 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) + 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,6 +672,7 @@ CFLAGS = $(CFLAGS) /fsanitize=address !endif !ifdef NODEBUG + VIM = vim ! if "$(OPTIMIZE)" == "SPACE" OPTFLAG = /O1 @@ -701,7 +703,9 @@ LIBC = msvcrt.lib LIBC = libcmt.lib CFLAGS = $(CFLAGS) /Zl /MT ! endif + !else # DEBUG + VIM = vimd ! if ("$(CPU)" == "i386") || ("$(CPU)" == "ix86") DEBUGINFO = /ZI @@ -721,6 +725,7 @@ LIBC = $(LIBC) msvcrtd.lib LIBC = $(LIBC) libcmtd.lib CFLAGS = $(CFLAGS) /Zl /MTd ! endif + !endif # DEBUG !if "$(CL)" == "/D_USING_V110_SDK71_" @@ -910,9 +915,7 @@ GUI_OBJ = \ $(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) + version.lib $(IME_LIB) winspool.lib comctl32.lib !else SUBSYSTEM = console CUI_INCL = iscygpty.h @@ -1320,11 +1323,11 @@ conflags = $(conflags) /map /mapinfo:lines !ENDIF LINKARGS1 = $(linkdebug) $(conflags) -LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) user32.lib \ +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. +# Report link time code generation progress if used. !ifdef NODEBUG ! if $(MSVC_MAJOR) >= 8 ! if "$(OPTIMIZE)" != "SPACE" |