summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-28 16:32:38 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-28 16:32:38 +0100
commite88a5f3a2c18426a68c4591d61bc612276878b46 (patch)
tree1b77908df120d80826fd0c71c887587daf68739c
parentdff54ac7e85f14f91faeadbaff22b23b2e5efb84 (diff)
downloadvim-e88a5f3a2c18426a68c4591d61bc612276878b46.zip
updated for version 7.4.106
Problem: Can't build with Ruby using Cygwin. Solution: Fix library name in makefile. (Steve Hall)
-rw-r--r--src/Make_cyg.mak4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index ee51c2405..61300722f 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -1,6 +1,6 @@
#
# Makefile for VIM on Win32, using Cygnus gcc
-# Last updated by Dan Sharp. Last Change: 2013 Sep 19
+# Last updated by Dan Sharp. Last Change: 2013 Nov 28
#
# Also read INSTALLpc.txt!
#
@@ -272,7 +272,7 @@ ifeq (yes, $(DYNAMIC_RUBY))
DEFINES += -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\"
DEFINES += -DDYNAMIC_RUBY_VER=$(RUBY_VER)
else
-EXTRA_LIBS += $(RUBY)/lib/$(RUBY_INSTALL_NAME).lib
+EXTRA_LIBS += $(RUBY)/lib/$(RUBY_INSTALL_NAME)
endif
endif
diff --git a/src/version.c b/src/version.c
index c5c7fd458..bd7760175 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 106,
+/**/
105,
/**/
104,