summaryrefslogtreecommitdiff
path: root/cygwin
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-28 16:07:34 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-28 16:07:34 +0000
commit032825472be96143de44bc0ee9795735d03dfbf4 (patch)
tree8ca6c1e3f6d094a06934c12532267cc0ec66edd8 /cygwin
parente83171c4c4f71093a64abc2c4bb9bdb6a1445e02 (diff)
* 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
Diffstat (limited to 'cygwin')
-rw-r--r--cygwin/GNUmakefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 0e89d15..4fc628f 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -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 \