diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -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 $(?:/=\) $@ |