diff options
| -rw-r--r-- | src/Make_ming.mak | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak index f57fb18d0..0a9178903 100644 --- a/src/Make_ming.mak +++ b/src/Make_ming.mak @@ -212,23 +212,25 @@ ifndef RUBY_VER_LONG RUBY_VER_LONG = 1.6 endif -ifeq ($(RUBY_VER), 16) ifndef RUBY_PLATFORM +ifeq ($(RUBY_VER), 16) RUBY_PLATFORM = i586-mswin32 -endif -ifndef RUBY_INSTALL_NAME -RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) -endif +else ifneq ("X$(wildcard, $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32)", X) +RUBY_PLATFORM = i386-mingw32 else -ifndef RUBY_PLATFORM RUBY_PLATFORM = i386-mswin32 endif +endif + ifndef RUBY_INSTALL_NAME +ifeq ($(RUBY_VER), 16) +RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) +else RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) endif endif -RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) +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 (no, $(DYNAMIC_RUBY)) RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME) endif diff --git a/src/version.c b/src/version.c index 9d48925ae..c9adec1f2 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 388, +/**/ 387, /**/ 386, |