Mercurial > vim
changeset 14818:63b2ee46537f v8.1.0421
patch 8.1.0421: MS-Windows: Ruby path is wrong for Ruby 1.9 and later
commit https://github.com/vim/vim/commit/76c612a166a59be04d5a38dc8db3b76ee67a458b
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 21 14:31:51 2018 +0200
patch 8.1.0421: MS-Windows: Ruby path is wrong for Ruby 1.9 and later
Problem: MS-Windows: Ruby path is wrong for Ruby 1.9 and later.
Solution: Let -I argument depend on Ruby version. (Ken Takata, closes https://github.com/vim/vim/issues/3461)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 21 Sep 2018 14:45:06 +0200 |
parents | 6d18672ad22e |
children | b6aa6c36c7bd |
files | src/Make_cyg_ming.mak src/Make_mvc.mak src/version.c |
diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -475,9 +475,10 @@ ifeq (19, $(word 1,$(sort 19 $(RUBY_VER) RUBY_19_OR_LATER = 1 endif +ifdef RUBY_19_OR_LATER +RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) +else RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) -ifdef RUBY_19_OR_LATER -RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1136,7 +1136,7 @@ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_A CFLAGS = $(CFLAGS) -DFEAT_RUBY RUBY_OBJ = $(OUTDIR)\if_ruby.obj !if $(RUBY_VER) >= 19 -RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" +RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" !else RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" !endif