summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 87b15e5856..eed69e1554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 3 12:54:48 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (RCFLAGS): VC10 and after only. fixed the problem
+ of r30015. [ruby-core:33530]
+
Fri Dec 3 12:41:52 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 18a8cb4eef..704d9609b3 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -240,7 +240,7 @@ DLDFLAGS = $(LDFLAGS) -dll
SOLIBS =
RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
!ifndef RCFLAGS
-!if $(MSC_VER) >= 1500
+!if $(MSC_VER) >= 1600
RCFLAGS=-nologo
!endif
!endif