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
index 54c42acc6a6aadfacc169499e31f0cf950edb7d4..dea9e1011a74643af8031761a683cb5d47929289 100644 (file)
--- 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
index 5769bd64ba94c3304f8987851cb1405e1ed6cbe9..2b759dce17a9fdecdcd78222921893e5ff6e8233 100644 (file)
--- 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
index 24f19c9f2a7d5a4300026657620d0965ec0fdbda..4b9985f70abafd1bfa85495e5717fdb3bb7d8196 100644 (file)
--- 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
index e3a8b9e0fb7908f4f7027e5b1a5ee687ebaf4440..890f15d09c0469416929bf72f7a54f9444417d36 100644 (file)
--- 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
index f2e7c827123b0202f110630c5876b8ffb29cf99b..1a923447657a19b8639b2d94efdf557438194528 100644 (file)
--- 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
index 16589ea8adedbace99b575c478ec8638f5793848..a891a9743b0d6f4f0a762f58d1e5c12414feabc2 100644 (file)
--- 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
index 101c5c6b3290c861b3ecb69745c5d773686cf059..6305cd381e79948460021c481764b9f36ce5342a 100644 (file)
--- 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 ascii.h term.h structs.h os_amiga.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
index de1d88fe4c37dbef07bff92d5d407da9ae97fb98..82988629eed0fdd0e5522318460a17b659e05ee0 100644 (file)
--- 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
index aa8fbd927a354296de9ba949cb6df2f8bee672ed..15a74773c2c02ba10c8bd592ff2d4c87b28584a3 100644 (file)
--- 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
index 24069b24e99116b8e87f1591c71ee8ab17d66623..c93f4b4aaa8a8cbe2d8e6e21cea77665925f8da1 100644 (file)
--- 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 @@ $(OUTDIR)/buffer.obj:    $(OUTDIR) buffer.c  $(INCL)
 
 $(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
index 42dbdb346eaa1952eb6e2ede776dd69d7b945e48..cd62d1c6d504f64529e9be78e7c960e218efff18 100644 (file)
--- 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
index bf57c0dcb2b94f5acbd25a7c958aa53d608ca584..49dcb6bdcd611029cba9d0602e2e35a8edcaa079 100644 (file)
--- 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
index 57c23b5e62454ed186097805739c0c1479cd4d60..33cc85dcfded77bd44213eadfad89a58bfab2ef0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    401,
 /**/
     400,
 /**/