K.Takata's patch queue for Vim
Revision | ef7ded0f62bf5992ad32fbd1ef1d117768fa19ea (tree) |
---|---|
Zeit | 2022-01-28 09:44:10 |
Autor | K.Takata <kentkt@csc....> |
Commiter | K.Takata |
Add a new patch
@@ -30,4 +30,5 @@ | ||
30 | 30 | wip-win32-vimdir-encoding.patch #+wip |
31 | 31 | win32-directwrite-ambiwidth-auto.patch |
32 | 32 | suppress-warnings.patch |
33 | +win32-adjust-link-options.patch | |
33 | 34 | fix-config_cache-removal.patch #+rejected |
@@ -0,0 +1,46 @@ | ||
1 | +# HG changeset patch | |
2 | +# Parent e012dc226b5de0a984ad0b2e9ee8e4108ff41820 | |
3 | + | |
4 | +diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak | |
5 | +--- a/src/Make_mvc.mak | |
6 | ++++ b/src/Make_mvc.mak | |
7 | +@@ -1262,25 +1262,29 @@ LINK_PDB = /PDB:$(VIM).pdb -debug | |
8 | + # CFLAGS with /Fo$(OUTDIR)/ | |
9 | + CFLAGS_OUTDIR=$(CFLAGS) /Fo$(OUTDIR)/ | |
10 | + | |
11 | ++PATHDEF_SRC = $(OUTDIR)\pathdef.c | |
12 | ++ | |
13 | ++LINKARGS1 = /nologo | |
14 | ++LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \ | |
15 | ++ $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ | |
16 | ++ $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) | |
17 | ++ | |
18 | ++!ifdef NODEBUG | |
19 | + # Add /opt:ref to remove unreferenced functions and data even when /DEBUG is | |
20 | + # added. | |
21 | +-conflags = /nologo /opt:ref | |
22 | +- | |
23 | +-PATHDEF_SRC = $(OUTDIR)\pathdef.c | |
24 | ++LINKARGS1 = $(LINKARGS1) /opt:ref | |
25 | ++!else | |
26 | ++LINKARGS1 = $(LINKARGS1) /opt:noref /opt:noicf | |
27 | ++!endif | |
28 | + | |
29 | + !IF "$(MAP)" == "yes" | |
30 | + # "/map" is for debugging | |
31 | +-conflags = $(conflags) /map | |
32 | ++LINKARGS1 = $(LINKARGS1) /map | |
33 | + !ELSEIF "$(MAP)" == "lines" | |
34 | + # "/mapinfo:lines" is for debugging, only works for VC6 and later | |
35 | +-conflags = $(conflags) /map /mapinfo:lines | |
36 | ++LINKARGS1 = $(LINKARGS1) /map /mapinfo:lines | |
37 | + !ENDIF | |
38 | + | |
39 | +-LINKARGS1 = $(linkdebug) $(conflags) | |
40 | +-LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \ | |
41 | +- $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ | |
42 | +- $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) | |
43 | +- | |
44 | + # Enable link time code generation if needed. | |
45 | + !ifdef NODEBUG | |
46 | + ! if "$(OPTIMIZE)" != "SPACE" |