diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 14:06:54 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 14:06:54 +0000 |
| commit | 2f1a781e8506cb878cba878070e8bcaa7e6e5d5d (patch) | |
| tree | 1dd60578b1736e75185017ae89230d4e20fc22d5 /win32 | |
| parent | c20b8f75dd2aa3797e35aa48ec45dc45e487ae7a (diff) | |
* 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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 6 insertions, 1 deletions
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 $(?:/=\) $@ |