usa	2011-07-12 11:59:11 +0900 (Tue, 12 Jul 2011)

  New Revision: 32521

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

  Log:
    * win32/setup.mak: support x86-amd64 cross compile environment.

  Modified files:
    trunk/ChangeLog
    trunk/win32/setup.mak

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32520)
+++ ChangeLog	(revision 32521)
@@ -1,3 +1,7 @@
+Tue Jul 12 11:58:28 2011  NAKAMURA Usaku  <usa@r...>
+
+	* win32/setup.mak: support x86-amd64 cross compile environment.
+
 Mon Jul 11 23:22:28 2011  Yutaka Kanemoto  <kanemoto@r...>
 
 	* time.c: can't compile time.c on AIX due to missing declaration for
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 32520)
+++ win32/setup.mak	(revision 32521)
@@ -204,8 +204,18 @@
 $(ARCH) = x64
 !elseif "$(PROCESSOR_ARCHITECTURE)" == "IA64"
 $(ARCH) = ia64
+!elseif defined(PROCESSOR_ARCHITEW6432)
+$(BANG)if "$$(TARGET_OS)" == "mswin64"
+!if "$(PROCESSOR_ARCHITECTURE)" == "IA64"
+$(ARCH) = ia64
 !else
+$(ARCH) = x64
+!endif
+$(BANG)else
 $(ARCH) = $(PROCESSOR_ARCHITECTURE)
+$(BANG)endif
+!else
+$(ARCH) = $(PROCESSOR_ARCHITECTURE)
 !endif
 !endif
 !if defined($(CPU))

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