diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-16 18:49:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-16 18:49:47 +0100 |
| commit | c4390fe6c0d1b47b1acd373d7e8ef986412c0600 (patch) | |
| tree | bb4e1a158a1dd4cd72dcaefbd447e4b65e9762de | |
| parent | 50dc3ecc642ee88348cb353cf85d08eac26c75dd (diff) | |
patch 8.2.1994: MS-Windows: MinGW always does a full buildv8.2.1994
Problem: MS-Windows: MinGW always does a full build.
Solution: Only check if $OUTDIR exists. (Masamichi Abe, closes #7311)
| -rw-r--r-- | src/Make_cyg_ming.mak | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 498f34e1f0..b6dd928b12 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -1055,23 +1055,23 @@ install.exe: dosinst.c dosinst.h version.h uninstall.exe: uninstall.c dosinst.h version.h $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 -$(OBJ): $(OUTDIR) +$(OBJ): | $(OUTDIR) -$(EXEOBJG): $(OUTDIR) +$(EXEOBJG): | $(OUTDIR) -$(EXEOBJC): $(OUTDIR) +$(EXEOBJC): | $(OUTDIR) ifeq ($(VIMDLL),yes) -$(TARGET): $(OUTDIR) $(OBJ) +$(TARGET): $(OBJ) $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) -$(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll +$(GVIMEXE): $(EXEOBJG) $(VIMDLLBASE).dll $(CC) -L. $(EXELFLAGS) -mwindows -o $@ $(EXEOBJG) -l$(VIMDLLBASE) -$(VIMEXE): $(OUTDIR) $(EXEOBJC) $(VIMDLLBASE).dll +$(VIMEXE): $(EXEOBJC) $(VIMDLLBASE).dll $(CC) -L. $(EXELFLAGS) -o $@ $(EXEOBJC) -l$(VIMDLLBASE) else -$(TARGET): $(OUTDIR) $(OBJ) +$(TARGET): $(OBJ) $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) endif @@ -1286,7 +1286,7 @@ $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) $(CC) -c $(CFLAGS) $< -o $@ -$(PATHDEF_SRC): $(OUTDIR) Make_cyg_ming.mak Make_cyg.mak Make_ming.mak +$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak | $(OUTDIR) ifneq (sh.exe, $(SHELL)) @echo creating $(PATHDEF_SRC) @echo '/* pathdef.c */' > $(PATHDEF_SRC) diff --git a/src/version.c b/src/version.c index 3ab3ab4d04..8418d98d2c 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1994, +/**/ 1993, /**/ 1992, |