Mercurial > vim

comparison src/Make_mvc.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 b65d7aba8d0d
children 8b1b3228c410
comparison
equal deleted inserted replaced
14817:6d18672ad22e 14818:63b2ee46537f
1134 1134
1135 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" 1135 !message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)"
1136 CFLAGS = $(CFLAGS) -DFEAT_RUBY 1136 CFLAGS = $(CFLAGS) -DFEAT_RUBY
1137 RUBY_OBJ = $(OUTDIR)\if_ruby.obj 1137 RUBY_OBJ = $(OUTDIR)\if_ruby.obj
1138 !if $(RUBY_VER) >= 19 1138 !if $(RUBY_VER) >= 19
1139 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)" 1139 RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)" /I "$(RUBY)\include\ruby-$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
1140 !else 1140 !else
1141 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)" 1141 RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_API_VER_LONG)\$(RUBY_PLATFORM)"
1142 !endif 1142 !endif
1143 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib 1143 RUBY_LIB = $(RUBY)\lib\$(RUBY_INSTALL_NAME).lib
1144 # Do we want to load Ruby dynamically? 1144 # Do we want to load Ruby dynamically?