usa	2011-07-16 11:22:48 +0900 (Sat, 16 Jul 2011)

  New Revision: 32561

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

  Log:
    * win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,
      perhaps).
      backported r32521 from trunk

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/win32/setup.mak

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32560)
+++ ruby_1_9_3/ChangeLog	(revision 32561)
@@ -1,3 +1,9 @@
+Sat Jul 16 11:18:26 2011  NAKAMURA Usaku  <usa@r...>
+
+	* win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,
+	  perhaps).
+	  backported r32521 from trunk
+
 Sat Jul 16 06:31:23 2011  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* lib/uri/common.rb (module): Remove optional parser argument to
Index: ruby_1_9_3/win32/setup.mak
===================================================================
--- ruby_1_9_3/win32/setup.mak	(revision 32560)
+++ ruby_1_9_3/win32/setup.mak	(revision 32561)
@@ -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/