Mercurial > vim

comparison src/Make_cyg_ming.mak @ 14818:63b2ee46537f v8.1.0421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7968031aeaa3
children 8ff32a34f25e
comparison
equal deleted inserted replaced
14817:6d18672ad22e 14818:63b2ee46537f
473 473
474 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) 474 ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
475 RUBY_19_OR_LATER = 1 475 RUBY_19_OR_LATER = 1
476 endif 476 endif
477 477
478 ifdef RUBY_19_OR_LATER
479 RUBYINC = -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
480 else
478 RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM) 481 RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
479 ifdef RUBY_19_OR_LATER
480 RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_API_VER_LONG)/$(RUBY_PLATFORM)
481 endif 482 endif
482 ifeq (no, $(DYNAMIC_RUBY)) 483 ifeq (no, $(DYNAMIC_RUBY))
483 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) 484 RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
484 endif 485 endif
485 486