1
0
forked from aniani/vim

updated for version 7.2.388

Problem:    Ruby with MingW still doesn't build all versions.
Solution:   Different approach to build file. (Sergey Khorev)
This commit is contained in:
Bram Moolenaar 2010-03-10 13:20:40 +01:00
parent 42d57f0017
commit 66ca320d9e
2 changed files with 11 additions and 7 deletions

View File

@ -212,23 +212,25 @@ ifndef RUBY_VER_LONG
RUBY_VER_LONG = 1.6 RUBY_VER_LONG = 1.6
endif endif
ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16) ifeq ($(RUBY_VER), 16)
ifndef RUBY_PLATFORM
RUBY_PLATFORM = i586-mswin32 RUBY_PLATFORM = i586-mswin32
endif else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X)
ifndef RUBY_INSTALL_NAME RUBY_PLATFORM = i386-mingw32
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
endif
else else
ifndef RUBY_PLATFORM
RUBY_PLATFORM = i386-mswin32 RUBY_PLATFORM = i386-mswin32
endif endif
endif
ifndef RUBY_INSTALL_NAME ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16)
RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
else
RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
endif endif
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)) ifeq (no, $(DYNAMIC_RUBY))
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
endif endif

View File

@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
388,
/**/ /**/
387, 387,
/**/ /**/