# HG changeset patch # User Bram Moolenaar # Date 1407681110 -7200 # Node ID ab71bb81b84e9a1cdf030b172f61d779ccda975c # Parent 0ccbf92e36c043ec944614b02f4c83f0f41929d6 updated for version 7.4.401 Problem: Can't build on MS-Windows. Solution: Include the new files in all the Makefiles. diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak --- a/src/Make_bc3.mak +++ b/src/Make_bc3.mak @@ -54,6 +54,8 @@ EXE_dependencies = \ blowfish.obj \ buffer.obj \ charset.obj \ + crypt.obj \ + crypt_zip.obj \ diff.obj \ digraph.obj \ edit.obj \ diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak --- a/src/Make_bc5.mak +++ b/src/Make_bc5.mak @@ -580,6 +580,8 @@ vimobj = \ $(OBJDIR)\blowfish.obj \ $(OBJDIR)\buffer.obj \ $(OBJDIR)\charset.obj \ + $(OBJDIR)\crypt.obj \ + $(OBJDIR)\crypt_zip.obj \ $(OBJDIR)\diff.obj \ $(OBJDIR)\digraph.obj \ $(OBJDIR)\edit.obj \ diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -1,6 +1,7 @@ # # Makefile for VIM on Win32, using Cygnus gcc -# Last updated by Dan Sharp. Last Change: 2013 Dec 11 +# Updated by Dan Sharp. +# Last Change: 2014 Aug 10 # # Also read INSTALLpc.txt! # @@ -546,6 +547,8 @@ OBJ = \ $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ + $(OUTDIR)/crypt.o \ + $(OUTDIR)/crypt_zip.o \ $(OUTDIR)/diff.o \ $(OUTDIR)/digraph.o \ $(OUTDIR)/edit.o \ diff --git a/src/Make_dice.mak b/src/Make_dice.mak --- a/src/Make_dice.mak +++ b/src/Make_dice.mak @@ -29,6 +29,8 @@ SRC = \ blowfish.c \ buffer.c \ charset.c \ + crypt.c \ + crypt_zip.c \ diff.c \ digraph.c \ edit.c \ @@ -75,6 +77,8 @@ SRC = \ OBJ = o/blowfish.o \ o/buffer.o \ o/charset.o \ + o/crypt.o \ + o/crypt_zip.o \ o/diff.o \ o/digraph.o \ o/edit.o \ @@ -143,6 +147,10 @@ o/buffer.o: buffer.c $(SYMS) o/charset.o: charset.c $(SYMS) +o/crypt.o: crypt.c $(SYMS) + +o/crypt_zip.o: crypt_zip.c $(SYMS) + o/diff.o: diff.c $(SYMS) o/digraph.o: digraph.c $(SYMS) diff --git a/src/Make_djg.mak b/src/Make_djg.mak --- a/src/Make_djg.mak +++ b/src/Make_djg.mak @@ -22,6 +22,8 @@ OBJ = \ obj/blowfish.o \ obj/buffer.o \ obj/charset.o \ + obj/crypt.o \ + obj/crypt_zip.o \ obj/diff.o \ obj/digraph.o \ obj/edit.o \ diff --git a/src/Make_ivc.mak b/src/Make_ivc.mak --- a/src/Make_ivc.mak +++ b/src/Make_ivc.mak @@ -213,6 +213,8 @@ LINK32_OBJS= \ "$(INTDIR)/blowfish.obj" \ "$(INTDIR)/buffer.obj" \ "$(INTDIR)/charset.obj" \ + "$(INTDIR)/crypt.obj" \ + "$(INTDIR)/crypt_zip.obj" \ "$(INTDIR)/diff.obj" \ "$(INTDIR)/digraph.obj" \ "$(INTDIR)/edit.obj" \ @@ -339,6 +341,14 @@ SOURCE=.\charset.c # End Source File # Begin Source File +SOURCE=.\crypt.c +# End Source File +# Begin Source File + +SOURCE=.\crypt_zip.c +# End Source File +# Begin Source File + SOURCE=.\diff.c # End Source File # Begin Source File diff --git a/src/Make_manx.mak b/src/Make_manx.mak --- a/src/Make_manx.mak +++ b/src/Make_manx.mak @@ -37,6 +37,8 @@ DEL = $(SHELL) -c rm -f SRC = blowfish.c \ buffer.c \ charset.c \ + crypt.c \ + crypt_zip.c \ diff.c \ digraph.c \ edit.c \ @@ -85,6 +87,8 @@ INCL = vim.h feature.h keymap.h macros.h OBJ = obj/blowfish.o \ obj/buffer.o \ obj/charset.o \ + obj/crypt.o \ + obj/crypt_zip.o \ obj/diff.o \ obj/digraph.o \ obj/edit.o \ @@ -131,6 +135,8 @@ OBJ = obj/blowfish.o \ PRO = proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ + proto/crypt.pro \ + proto/crypt_zip.pro \ proto/diff.pro \ proto/digraph.pro \ proto/edit.pro \ @@ -227,6 +233,12 @@ obj/buffer.o: buffer.c obj/charset.o: charset.c $(CCSYM) $@ charset.c +obj/crypt.o: crypt.c + $(CCSYM) $@ crypt.c + +obj/crypt_zip.o: crypt_zip.c + $(CCSYM) $@ crypt_zip.c + obj/diff.o: diff.c $(CCSYM) $@ diff.c diff --git a/src/Make_ming.mak b/src/Make_ming.mak --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -517,6 +517,8 @@ OBJ = \ $(OUTDIR)/blowfish.o \ $(OUTDIR)/buffer.o \ $(OUTDIR)/charset.o \ + $(OUTDIR)/crypt.o \ + $(OUTDIR)/crypt_zip.o \ $(OUTDIR)/diff.o \ $(OUTDIR)/digraph.o \ $(OUTDIR)/edit.o \ diff --git a/src/Make_morph.mak b/src/Make_morph.mak --- a/src/Make_morph.mak +++ b/src/Make_morph.mak @@ -27,6 +27,8 @@ RM = rm SRC = blowfish.c \ buffer.c \ charset.c \ + crypt.c \ + crypt_zip.c \ diff.c \ digraph.c \ edit.c \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -547,6 +547,8 @@ OBJ = \ $(OUTDIR)\blowfish.obj \ $(OUTDIR)\buffer.obj \ $(OUTDIR)\charset.obj \ + $(OUTDIR)\crypt.obj \ + $(OUTDIR)\crypt_zip.obj \ $(OUTDIR)\diff.obj \ $(OUTDIR)\digraph.obj \ $(OUTDIR)\edit.obj \ @@ -1092,6 +1094,10 @@ testclean: $(OUTDIR)/charset.obj: $(OUTDIR) charset.c $(INCL) +$(OUTDIR)/crypt.obj: $(OUTDIR) crypt.c $(INCL) + +$(OUTDIR)/crypt_zip.obj: $(OUTDIR) crypt_zip.c $(INCL) + $(OUTDIR)/diff.obj: $(OUTDIR) diff.c $(INCL) $(OUTDIR)/digraph.obj: $(OUTDIR) digraph.c $(INCL) @@ -1278,6 +1284,8 @@ proto.h: \ proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ + proto/crypt.pro \ + proto/crypt_zip.pro \ proto/diff.pro \ proto/digraph.pro \ proto/edit.pro \ diff --git a/src/Make_os2.mak b/src/Make_os2.mak --- a/src/Make_os2.mak +++ b/src/Make_os2.mak @@ -42,6 +42,8 @@ OBJ = \ blowfish.o \ buffer.o \ charset.o \ + crypt.o \ + crypt_zip.o \ diff.o \ digraph.o \ edit.o \ @@ -117,6 +119,8 @@ os_unix.o: os_unix.c $(INCL) blowfish.o: blowfish.c $(INCL) buffer.o: buffer.c $(INCL) charset.o: charset.c $(INCL) +crypt.o: crypt.c $(INCL) +crypt_zip.o: crypt_zip.c $(INCL) diff.o: diff.c $(INCL) digraph.o: digraph.c $(INCL) edit.o: edit.c $(INCL) diff --git a/src/Make_sas.mak b/src/Make_sas.mak --- a/src/Make_sas.mak +++ b/src/Make_sas.mak @@ -92,6 +92,8 @@ SRC = \ blowfish.c \ buffer.c \ charset.c \ + crypt.c \ + crypt_zip.c \ diff.c \ digraph.c \ edit.c \ @@ -139,6 +141,8 @@ OBJ = \ blowfish.o \ buffer.o \ charset.o \ + crypt.o \ + crypt_zip.o \ diff.o \ digraph.o \ edit.o \ @@ -186,6 +190,8 @@ PRO = \ proto/blowfish.pro \ proto/buffer.pro \ proto/charset.pro \ + proto/crypt.pro \ + proto/crypt_zip.pro \ proto/diff.pro \ proto/digraph.pro \ proto/edit.pro \ @@ -290,6 +296,10 @@ buffer.o: buffer.c proto/buffer.pro: buffer.c charset.o: charset.c proto/charset.pro: charset.c +crypt.o: crypt.c +proto/crypt.pro: crypt.c +crypt_zip.o: crypt_zip.c +proto/crypt_zip.pro: crypt_zip.c diff.o: diff.c proto/diff.pro: diff.c digraph.o: digraph.c diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 401, +/**/ 400, /**/ 399,