mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in: remove unnecessary AC_CANONICAL_BUILD
* defins.h: #define HAVE_SETITIMER on Cygwin(bug fixed). * ruby.c: use relative path from LIBRUBY_SO. * ruby.c: don't use -mwin32 option on Cygwin. * cygwin/GNUmakefile.in: ditto. * ext/sdbm/_sdbm: ditto. * ext/tcltklib/extconf.rb: ditto. * ext/tcltklib/stubs.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e83171c4c4
commit
032825472b
8 changed files with 43 additions and 20 deletions
|
@ -5,6 +5,8 @@ ENABLE_SHARED=@ENABLE_SHARED@
|
|||
ifneq (,$(findstring no, $(ENABLE_SHARED)))
|
||||
EXTOBJS = $(RUBY_INSTALL_NAME).exp
|
||||
LIBRUBYARG = $(LIBRUBY_A)
|
||||
else
|
||||
CPPFLAGS += -DLIBRUBY_SO=\"$(LIBRUBY_SO)\"
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring ruby, $(RUBY_INSTALL_NAME)))
|
||||
|
@ -21,7 +23,7 @@ $(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@
|
|||
$(LIBRUBY): $(LIBRUBY_SO)
|
||||
|
||||
%.res.@OBJEXT@: %.rc
|
||||
@WINDRES@ --preprocessor '$(CC) -E -xc-header -DRC_INVOKE @MWIN32@' --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
|
||||
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
|
||||
@@MINIRUBY@ $(srcdir)/win32/resource.rb \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue