diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-06 21:46:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-06 21:46:15 +0200 |
| commit | 5ec849896f73c82030e4a59377361d0f93c6476f (patch) | |
| tree | ba7769624e8beff1cf60345aa3a581af287186f4 | |
| parent | 196b4664432f932625cfb6371dc42c24efe6c203 (diff) | |
| download | vim-git-5ec849896f73c82030e4a59377361d0f93c6476f.tar.gz | |
patch 8.1.1994: MS-Windows: cannot build with eval but without cscopev8.1.1994
Problem: MS-Windows: cannot build with eval but without cscope
Solution: Adjust the makefiles to always build if_cscope.obj.
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 90a346148..9f86cef72 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -736,6 +736,7 @@ OBJ = \ $(OUTDIR)/hardcopy.o \ $(OUTDIR)/hashtab.o \ $(OUTDIR)/highlight.o \ + $(OUTDIR)/if_cscope.o \ $(OUTDIR)/indent.o \ $(OUTDIR)/insexpand.o \ $(OUTDIR)/json.o \ @@ -821,9 +822,6 @@ endif ifdef TCL OBJ += $(OUTDIR)/if_tcl.o endif -ifeq ($(CSCOPE),yes) -OBJ += $(OUTDIR)/if_cscope.o -endif ifeq ($(NETBEANS),yes) ifneq ($(CHANNEL),yes) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 6e0439eb8..31970faf3 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -349,8 +349,6 @@ CSCOPE = yes !if "$(CSCOPE)" == "yes" # CSCOPE - Include support for Cscope -CSCOPE_INCL = if_cscope.h -CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj CSCOPE_DEFS = -DFEAT_CSCOPE !endif @@ -745,6 +743,7 @@ OBJ = \ $(OUTDIR)\hardcopy.obj \ $(OUTDIR)\hashtab.obj \ $(OUTDIR)\highlight.obj \ + $(OBJDIR)\if_cscope.obj \ $(OUTDIR)\indent.obj \ $(OUTDIR)\insexpand.obj \ $(OUTDIR)\json.obj \ @@ -1285,13 +1284,13 @@ all: $(MAIN_TARGET) \ $(VIMDLLBASE).dll: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ - $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ + $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ version.c version.h $(CC) $(CFLAGS_OUTDIR) version.c $(link) @<< $(LINKARGS1) /dll -out:$(VIMDLLBASE).dll $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) -$(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) +$(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) << @@ -1307,13 +1306,13 @@ $(VIM).exe: $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll $(VIM).exe: $(OUTDIR) $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ - $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ + $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ version.c version.h $(CC) $(CFLAGS_OUTDIR) version.c $(link) @<< $(LINKARGS1) /subsystem:$(SUBSYSTEM) -out:$(VIM).exe $(OBJ) $(XDIFF_OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) -$(TCL_OBJ) $(CSCOPE_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) +$(TCL_OBJ) $(TERM_OBJ) $(SOUND_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) << if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 diff --git a/src/version.c b/src/version.c index 05e882908..88e079126 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1994, +/**/ 1993, /**/ 1992, |