diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-11-28 16:18:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-11-28 16:18:29 +0100 |
| commit | 996ed2306bace4b8f54ea7adfeda2bc4b7a659cf (patch) | |
| tree | f216084aa4d0058111f77f98ca3b26290357991f | |
| parent | b316018eae9e5fa8b2679dee7afa2781637de47e (diff) | |
| download | vim-996ed2306bace4b8f54ea7adfeda2bc4b7a659cf.tar.gz | |
Problem: Cannot build Ruby 1.9 with MingW or Cygwin.
Solution: Add another include directory. (Ken Takata)
| -rw-r--r-- | src/Make_cyg.mak | 13 | ||||
| -rw-r--r-- | src/Make_ming.mak | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak index 1c6ceda0..a5614166 100644 --- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -21,7 +21,11 @@ # TCL_VER define to version of TCL being used (83) # DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (yes) # RUBY define to path to Ruby dir to get Ruby support (not defined) -# RUBY_VER define to version of Ruby being used (16) +# RUBY_VER define to version of Ruby being used (16) +# RUBY_VER_LONG same, but in format with dot. (1.6) +# 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. # DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (yes) # MZSCHEME define to path to MzScheme dir to get MZSCHEME support (not defined) # MZSCHEME_VER define to version of MzScheme being used (209_000) @@ -217,8 +221,15 @@ RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) endif endif +ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) +RUBY_19_OR_LATER = 1 +endif + DEFINES += -DFEAT_RUBY INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +ifdef RUBY_19_OR_LATER +INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +endif EXTRA_OBJS += $(OUTDIR)/if_ruby.o ifeq (yes, $(DYNAMIC_RUBY)) diff --git a/src/Make_ming.mak b/src/Make_ming.mak index 8e523a24..9402ccce 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -301,7 +301,14 @@ RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) endif endif -RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +ifeq (19, $(word 1,$(sort 19 $(RUBY_VER)))) +RUBY_19_OR_LATER = 1 +endif + +RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +ifdef RUBY_19_OR_LATER +RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +endif ifeq (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) endif diff --git a/src/version.c b/src/version.c index 87762a97..80c82d64 100644 --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 735, +/**/ 734, /**/ 733, |