]> granicus.if.org Git - vim/commitdiff
updated for version 7.2.388 v7.2.388
authorBram Moolenaar <Bram@vim.org>
Wed, 10 Mar 2010 12:20:40 +0000 (13:20 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 10 Mar 2010 12:20:40 +0000 (13:20 +0100)
Problem:    Ruby with MingW still doesn't build all versions.
Solution:   Different approach to build file. (Sergey Khorev)

src/Make_ming.mak
src/version.c

index f57fb18d00bde3fd545f727fdc55239dd9836faf..0a9178903448b8ae907e75d3338869a5037077de 100644 (file)
@@ -212,23 +212,25 @@ ifndef RUBY_VER_LONG
 RUBY_VER_LONG = 1.6
 endif
 
-ifeq ($(RUBY_VER), 16)
 ifndef RUBY_PLATFORM
+ifeq ($(RUBY_VER), 16)
 RUBY_PLATFORM = i586-mswin32
-endif
-ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
-endif
+else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
+RUBY_PLATFORM = i386-mingw32
 else
-ifndef RUBY_PLATFORM
 RUBY_PLATFORM = i386-mswin32
 endif
+endif
+
 ifndef RUBY_INSTALL_NAME
+ifeq ($(RUBY_VER), 16)
+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
+else
 RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
 endif
 endif
 
-RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
+RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
 ifeq (no, $(DYNAMIC_RUBY))
 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
 endif
index 9d48925ae3e96a0fe81d852f515689a10bfc68f6..c9adec1f2ac67ad3615043c849257b915ba01e10 100644 (file)
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    388,
 /**/
     387,
 /**/