Created
January 31, 2012 05:10
-
-
Save mattn/1708979 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 54d621a3b561 src/Make_ming.mak | |
--- a/src/Make_ming.mak Thu Jan 26 20:58:26 2012 +0100 | |
+++ b/src/Make_ming.mak Tue Jan 31 14:10:34 2012 +0900 | |
@@ -257,6 +257,8 @@ | |
# RUBY_VER=[Ruby version, eg 16, 17] (default is 16) | |
# RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.6) | |
# You must set RUBY_VER_LONG when change RUBY_VER. | |
+# You must set ruby API version to RUBY_VER_LONG. | |
+# Don't set ruby API version to RUBY_VER like 191. | |
#RUBY=c:/ruby | |
ifdef RUBY | |
ifndef DYNAMIC_RUBY | |
@@ -269,6 +271,9 @@ | |
ifndef RUBY_VER_LONG | |
RUBY_VER_LONG = 1.6 | |
endif | |
+ifndef RUBY_API_VER | |
+RUBY_API_VER = $(subst .,,$(RUBY_VER_LONG)) | |
+endif | |
ifndef RUBY_PLATFORM | |
ifeq ($(RUBY_VER), 16) | |
@@ -284,9 +289,9 @@ | |
ifndef RUBY_INSTALL_NAME | |
ifeq ($(RUBY_VER), 16) | |
-RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) | |
+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) | |
else | |
-RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) | |
+RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) | |
endif | |
endif | |
diff -r 54d621a3b561 src/Make_mvc.mak | |
--- a/src/Make_mvc.mak Thu Jan 26 20:58:26 2012 +0100 | |
+++ b/src/Make_mvc.mak Tue Jan 31 14:10:34 2012 +0900 | |
@@ -63,6 +63,8 @@ | |
# RUBY_VER=[Ruby version, eg 16, 17] (default is 18) | |
# RUBY_VER_LONG=[Ruby version, eg 1.6, 1.7] (default is 1.8) | |
# You must set RUBY_VER_LONG when change RUBY_VER. | |
+# You must set ruby API version to RUBY_VER_LONG. | |
+# Don't set ruby API version to RUBY_VER like 191. | |
# | |
# Tcl interface: | |
# TCL=[Path to Tcl directory] | |
@@ -805,28 +807,31 @@ | |
!ifndef RUBY_VER_LONG | |
RUBY_VER_LONG = 1.8 | |
!endif | |
+!ifndef RUBY_API_VER | |
+RUBY_API_VER = $(RUBY_VER_LONG:.=) | |
+!endif | |
!if $(RUBY_VER) >= 18 | |
!ifndef RUBY_PLATFORM | |
RUBY_PLATFORM = i386-mswin32 | |
!endif | |
!ifndef RUBY_INSTALL_NAME | |
-RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) | |
+RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER) | |
!endif | |
!else | |
!ifndef RUBY_PLATFORM | |
RUBY_PLATFORM = i586-mswin32 | |
!endif | |
!ifndef RUBY_INSTALL_NAME | |
-RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) | |
+RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER) | |
!endif | |
!endif # $(RUBY_VER) >= 18 | |
!message Ruby requested (version $(RUBY_VER)) - root dir is "$(RUBY)" | |
CFLAGS = $(CFLAGS) -DFEAT_RUBY | |
RUBY_OBJ = $(OUTDIR)\if_ruby.obj | |
-!if $(RUBY_VER) >= 190 | |
-RUBY_INC = /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" /I "$(RUBY)\include\ruby-$(RUBY_VER_LONG)" | |
+!if $(RUBY_VER) >= 19 | |
+RUBY_INC = /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)" | |
!else | |
RUBY_INC = /I "$(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM)" | |
!endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment