mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Makefile.in (CPP): already used in .c.i rule.
* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and --preprocessor options explicitly. [ruby-core:32776] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7e0920723c
commit
835a5edf52
3 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
|||
Sat Oct 16 10:54:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in (CPP): already used in .c.i rule.
|
||||
|
||||
* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
|
||||
--preprocessor options explicitly. [ruby-core:32776]
|
||||
|
||||
Sat Oct 16 10:06:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
|
||||
|
|
|
@ -11,6 +11,7 @@ top_srcdir = $(srcdir)
|
|||
hdrdir = $(srcdir)/include
|
||||
|
||||
CC = @CC@
|
||||
CPP = @CPP@
|
||||
YACC = bison
|
||||
PURIFY =
|
||||
AUTOCONF = autoconf
|
||||
|
|
|
@ -2,7 +2,8 @@ include Makefile
|
|||
-include uncommon.mk
|
||||
|
||||
ENABLE_SHARED=@ENABLE_SHARED@
|
||||
DLLWRAP = @DLLWRAP@ --target=@target_os@
|
||||
DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
|
||||
WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
|
||||
|
||||
ifeq (@target_os@,cygwin)
|
||||
DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
|
||||
|
@ -38,7 +39,7 @@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
|
|||
$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
|
||||
|
||||
%.res.@OBJEXT@: %.rc
|
||||
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
$(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
|
||||
|
||||
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
|
||||
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
|
||||
|
|
Loading…
Reference in a new issue