diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-16 02:22:48 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-16 02:22:48 +0000 |
commit | f9e63da21b3357cc0f18f31714bfff5cd7b0515d (patch) | |
tree | 2fc563a0ed7992d733d8266c29da7c9b6ded749c | |
parent | 22120bccebc230657fa7e6481bb078ee9e6043dc (diff) |
* win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,
perhaps).
backported r32521 from trunk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | win32/setup.mak | 10 |
2 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sat Jul 16 11:18:26 2011 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@marc-andre.ca> * lib/uri/common.rb (module): Remove optional parser argument to diff --git a/win32/setup.mak b/win32/setup.mak index 0733e99bbb..0d9990ae8e 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -204,6 +204,16 @@ RUBY_SO_NAME = $(RUBY_SO_NAME) $(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 |