From 2f1a781e8506cb878cba878070e8bcaa7e6e5d5d Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Dec 2010 14:06:54 +0000
Subject: * win32/Makefile.sub (RCFLAGS): -nologo switch is only available in  
 newer versions of rc.exe. fixed the problem of r30012.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 win32/Makefile.sub | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b1addaf324..fb124518d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  2 23:05:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
+	  newer versions of rc.exe. fixed the problem of r30012.
+
 Thu Dec  2 21:28:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json/lib/json/add/rails.rb: removed.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e540a66813..18a8cb4eef 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -239,6 +239,11 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS = 
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+!ifndef RCFLAGS
+!if $(MSC_VER) >= 1500
+RCFLAGS=-nologo
+!endif
+!endif
 
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -implib:dummy.lib -def:$(RUBYDEF)
@@ -1004,7 +1009,7 @@ $(ruby_pc): $(RBCONFIG)
 
 .rc.res:
 	$(ECHO) compiling $(<:\=/)
-	$(Q) $(RC) -nologo -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+	$(Q) $(RC) $(RCFLAGS) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
 
 lex.c: {$(srcdir)}lex.c.blt
 	copy $(?:/=\) $@
-- 
cgit v1.2.3