summaryrefslogtreecommitdiff
path: root/src/Make_ming.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-08-02 21:21:47 +0200
committerBram Moolenaar <Bram@vim.org>2012-08-02 21:21:47 +0200
commitda3cb831e938d672361995d1dec2de3dae72ee5b (patch)
treed030432ac7424097e1171fb3af27abd7a1556866 /src/Make_ming.mak
parente4195c5d84027a3137ad4bc0ba5b6bd14b8a3a04 (diff)
downloadvim-git-da3cb831e938d672361995d1dec2de3dae72ee5b.tar.gz
updated for version 7.3.620v7.3.620
Problem: Building with recent Ruby on Win32 doesn't work. Solution: Add a separate argument for the API version. (Yasuhiro Matsumoto)
Diffstat (limited to 'src/Make_ming.mak')
-rw-r--r--src/Make_ming.mak11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 5b176dc13..de706eacc 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -260,7 +260,9 @@ endif
# DYNAMIC_RUBY=yes (to load the Ruby DLL dynamically)
# RUBY_VER=[Ruby version, eg 16, 17] (default is 16)
# RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6)
-# You must set RUBY_VER_LONG when change RUBY_VER.
+# You must set RUBY_VER_LONG when changing RUBY_VER.
+# You must set RUBY_API_VER version to RUBY_VER_LONG.
+# Don't set ruby API version to RUBY_VER like 191.
#RUBY=c:/ruby
ifdef RUBY
ifndef DYNAMIC_RUBY
@@ -273,6 +275,9 @@ endif
ifndef RUBY_VER_LONG
RUBY_VER_LONG = 1.6
endif
+ifndef RUBY_API_VER
+RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG))
+endif
ifndef RUBY_PLATFORM
ifeq ($(RUBY_VER), 16)
@@ -288,9 +293,9 @@ endif
ifndef RUBY_INSTALL_NAME
ifeq ($(RUBY_VER), 16)
-RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER)
+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
else
-RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER)
+RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
endif
endif