diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 5 |
3 files changed, 11 insertions, 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 diff --git a/Makefile.in b/Makefile.in index 99110b5caf..7a999082d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,7 @@ top_srcdir = $(srcdir) hdrdir = $(srcdir)/include CC = @CC@ +CPP = @CPP@ YACC = bison PURIFY = AUTOCONF = autoconf diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index ea530a33fc..025f460c9c 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -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 \ |