yugui	2010-10-23 18:37:11 +0900 (Sat, 23 Oct 2010)

  New Revision: 29566

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29566

  Log:
    merges r29516 from trunk into ruby_1_9_2.
    --
    * Makefile.in (CPP): already used in .c.i rule.
    
    * cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
      --preprocessor options explicitly.  [ruby-core:32776]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/Makefile.in
    branches/ruby_1_9_2/cygwin/GNUmakefile.in
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29565)
+++ ruby_1_9_2/ChangeLog	(revision 29566)
@@ -1,3 +1,10 @@
+Sat Oct 16 10:54:57 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (CPP): already used in .c.i rule.
+
+	* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
+	  --preprocessor options explicitly.  [ruby-core:32776]
+
 Thu Sep 23 09:01:28 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
Index: ruby_1_9_2/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_9_2/cygwin/GNUmakefile.in	(revision 29565)
+++ ruby_1_9_2/cygwin/GNUmakefile.in	(revision 29566)
@@ -2,7 +2,8 @@
 -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 @@
 $(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)
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
Index: ruby_1_9_2/Makefile.in
===================================================================
--- ruby_1_9_2/Makefile.in	(revision 29565)
+++ ruby_1_9_2/Makefile.in	(revision 29566)
@@ -11,6 +11,7 @@
 hdrdir = $(srcdir)/include
 
 CC = @CC@
+CPP = @CPP@
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29565)
+++ ruby_1_9_2/version.h	(revision 29566)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 19
+#define RUBY_PATCHLEVEL 20
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/