aboutsummaryrefslogtreecommitdiffstats
path: root/win32/Makefile.sub
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-08 19:48:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-08 19:48:22 +0000
commitf594f850a495da1d73dc8586301a76135eec8cf1 (patch)
treef084295d54e2b3a460049daa1cbe0b3034fe2c27 /win32/Makefile.sub
parent82f7f29c59bf97dcaf77d06269e03a936fa7a2cb (diff)
downloadruby-f594f850a495da1d73dc8586301a76135eec8cf1.tar.gz
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress warnings with $VERBOSE. * win32/resource.rb: only file which has more than one icon is DLL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
-rw-r--r--win32/Makefile.sub5
1 files changed, 1 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 4fa86903f9..cbf6378c37 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -166,7 +166,7 @@ EXEEXT = .exe
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT)
+MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
!if !defined(STACK)
@@ -211,9 +211,6 @@ config.status: $(CONFIG_H)
$(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
@echo Creating config.h
-!if exist(config.h)
- @copy config.h config.h.old > nul
-!endif
@$(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat config.h <<
#if _MSC_VER != $(MSC_VER)
#error MSC version unmatch