diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-21 14:31:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-21 14:31:51 +0200 |
| commit | 76c612a166a59be04d5a38dc8db3b76ee67a458b (patch) | |
| tree | 852de48a5108a8fb73166f0712de5e6b7cb0760c | |
| parent | 1f402806b88f4187e17c0105b4604f425f41dd1c (diff) | |
| download | vim-git-76c612a166a59be04d5a38dc8db3b76ee67a458b.tar.gz | |
patch 8.1.0421: MS-Windows: Ruby path is wrong for Ruby 1.9 and laterv8.1.0421
Problem: MS-Windows: Ruby path is wrong for Ruby 1.9 and later.
Solution: Let -I argument depend on Ruby version. (Ken Takata, closes #3461)
| -rw-r--r-- | src/Make_cyg_ming.mak | 5 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 7b9c7454e..ca0fa97a3 100644 --- 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 -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) +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) endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 919f0f041..1a3978c0e 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1136,7 +1136,7 @@ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) 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 diff --git a/src/version.c b/src/version.c index 992ed7ffd..c541dc9a1 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 421, +/**/ 420, /**/ 419, |