kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/Makefile.sub (RCFLAGS): -nologo switch is only available in

Browse source 
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
This commit is contained in:
usa 2010-12-02 14:06:54 +00:00
parent c20b8f75dd
commit 2f1a781e85
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

7
win32/Makefile.sub
View file

@ -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 $(?:/=\) $@