From 66ca320d9ee4953cc71991a4ddec17f11f3407ac Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 10 Mar 2010 13:20:40 +0100
Subject: updated for version 7.2.388 Problem:    Ruby with MingW still doesn't
 build all versions. Solution:   Different approach to build file. (Sergey
 Khorev)

---
 src/Make_ming.mak | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/Make_ming.mak')

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index f57fb18d0..0a9178903 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -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
-- 
cgit v1.2.1