usa	2010-12-02 23:06:54 +0900 (Thu, 02 Dec 2010)

  New Revision: 30054

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30054

  Log:
    * win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
      newer versions of rc.exe. fixed the problem of r30012.

  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30053)
+++ ChangeLog	(revision 30054)
@@ -1,3 +1,8 @@
+Thu Dec  2 23:05:14 2010  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* ext/json/lib/json/add/rails.rb: removed.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 30053)
+++ win32/Makefile.sub	(revision 30054)
@@ -239,6 +239,11 @@
 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 @@
 
 .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 $(?:/=\) $@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/