summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-08-10 16:31:50 +0200
committerBram Moolenaar <bram@vim.org>2014-08-10 16:31:50 +0200
commit45fa9ab3ad49e7abd75bea1136d24cf39e717426 (patch)
tree1e37bda8b2a384bced1fe9ef6b733492f5644005
parentbb27e0973b0df8c5b352d1f4704ba4b4596e3130 (diff)
downloadvim-45fa9ab3ad49e7abd75bea1136d24cf39e717426.tar.gz
updated for version 7.4.401v7.4.401v7-4-401
Problem: Can't build on MS-Windows. Solution: Include the new files in all the Makefiles.
-rw-r--r--src/Make_bc3.mak2
-rw-r--r--src/Make_bc5.mak2
-rw-r--r--src/Make_cyg.mak5
-rw-r--r--src/Make_dice.mak8
-rw-r--r--src/Make_djg.mak2
-rw-r--r--src/Make_ivc.mak10
-rw-r--r--src/Make_manx.mak12
-rw-r--r--src/Make_ming.mak2
-rw-r--r--src/Make_morph.mak2
-rw-r--r--src/Make_mvc.mak8
-rw-r--r--src/Make_os2.mak4
-rw-r--r--src/Make_sas.mak10
-rw-r--r--src/version.c2
13 files changed, 68 insertions, 1 deletions
diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak
index 54c42acc..dea9e101 100644
--- 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 5769bd64..2b759dce 100644
--- 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 24f19c9f..4b9985f7 100644
--- 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 e3a8b9e0..890f15d0 100644
--- 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 f2e7c827..1a923447 100644
--- 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 16589ea8..a891a974 100644
--- 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 101c5c6b..6305cd38 100644
--- 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 de1d88fe..82988629 100644
--- 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 aa8fbd92..15a74773 100644
--- 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 24069b24..c93f4b4a 100644
--- 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 42dbdb34..cd62d1c6 100644
--- 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 bf57c0dc..49dcb6bd 100644
--- 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 57c23b5e..33cc85dc 100644
--- 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,