From db3fbe5228025b7f87702e74cfbbb5acf01c7c39 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 7 Mar 2013 15:16:21 +0100 Subject: updated for version 7.3.848 Problem: Can't build with Ruby 2.0 when using MinGW x64 or MSVC10. Solution: Fix it. Also detect RUBY_PLATFORM and RUBY_INSTALL_NAME for x64. (Ken Takata) --- src/Make_ming.mak | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/Make_ming.mak') diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 695b7e7128..b8d7b200e8 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -288,18 +288,26 @@ else ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),) RUBY_PLATFORM = i386-mingw32 else +ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),) +RUBY_PLATFORM = x64-mingw32 +else RUBY_PLATFORM = i386-mswin32 endif endif endif +endif ifndef RUBY_INSTALL_NAME ifeq ($(RUBY_VER), 16) RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) else +ifeq ($(ARCH),x86-64) +RUBY_INSTALL_NAME = x64-msvcrt-ruby$(RUBY_API_VER) +else RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) endif endif +endif ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) RUBY_19_OR_LATER = 1 -- cgit v1.2.3