archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,

Browse source 
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
This commit is contained in:
usa 2011-07-16 02:22:48 +00:00
parent 22120bcceb
commit f9e63da21b
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

10
win32/setup.mak
View file

@ -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