diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 11:47:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 11:47:53 +0000 |
| commit | 1aa54c6db6a10bf671a80eddf93630fbbea4f810 (patch) | |
| tree | 6c2d44ce06689e3dfa7b80f4f0d52fb0825e5ad9 /win32/setup.mak | |
| parent | 41e9245e853c6d1f02a60f431afa87aeb7749787 (diff) | |
* include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
x64-mswin64 port.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index 797ed56a02..eb7b24b69b 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -12,7 +12,9 @@ srcdir = $(WIN32DIR)/.. !ifndef prefix prefix = /usr !endif +!if "$(OS)" != "mswin64" OS = mswin32 +!endif BANG = ! APPEND = echo>>$(MAKEFILE) !ifdef MAKEFILE @@ -26,14 +28,18 @@ CC = cl -nologo CPP = $(CC) -EP all: -prologue- -generic- -epilogue- -i386-$(OS): -prologue- -i386- -epilogue- -i486-$(OS): -prologue- -i486- -epilogue- -i586-$(OS): -prologue- -i586- -epilogue- -i686-$(OS): -prologue- -i686- -epilogue- -alpha-$(OS): -prologue- -alpha- -epilogue- +i386-mswin32: -prologue- -i386- -epilogue- +i486-mswin32: -prologue- -i486- -epilogue- +i586-mswin32: -prologue- -i586- -epilogue- +i686-mswin32: -prologue- -i686- -epilogue- +alpha-mswin32: -prologue- -alpha- -epilogue- +x64-mswin64: -prologue64- -x64- -epilogue- +ia64-mswin64: -prologue64- -ia64- -epilogue- -prologue-: -basic-vars- -system-vars- -version- -program-name- +-prologue64-: -basic-vars- -system-vars64- -version- -program-name- + -basic-vars-: nul @type << > $(MAKEFILE) ### Makefile for ruby $(OS) ### @@ -54,9 +60,14 @@ BASERUBY = $(BASERUBY) -system-vars-: -osname- -runtime- +-system-vars64-: -osname64- -runtime- + -osname-: nul @echo OS = mswin32 >>$(MAKEFILE) +-osname64-: nul + @echo OS = mswin64 >>$(MAKEFILE) + -runtime-: nul @$(CC) -MD <<rtname.c user32.lib > nul #include <windows.h> @@ -151,6 +162,10 @@ $(CPU) = $(PROCESSOR_LEVEL) -alpha-: nul @$(APPEND) $(ARCH) = alpha +-x64-: nul + @$(APPEND) $(ARCH) = x64 +-ia64-: nul + @$(APPEND) $(ARCH) = ia64 -ix86-: nul @$(APPEND) $(ARCH) = x86 |