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/Makefile.sub | |
| 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/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 1cfa8435f3..b9d02efcb3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -255,7 +255,11 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub #define SIZEOF___INT64 8 #define _INTEGRAL_MAX_BITS 64 #define SIZEOF_OFF_T 8 +!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +#define SIZEOF_VOIDP 8 +!else #define SIZEOF_VOIDP 4 +!endif #define SIZEOF_FLOAT 4 #define SIZEOF_DOUBLE 8 !if $(MSC_VER) >= 1400 @@ -520,7 +524,8 @@ $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res $(LDSHARED_2) $(RUBYDEF): $(LIBRUBY_A) $(PREP) - $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) + $(MINIRUBY) $(srcdir)/win32/mkexports.rb \ + -output=$@ -arch=$(ARCH) $(LIBRUBY_A) {$(srcdir)/win32}.def.lib: $(AR) $(ARFLAGS)$@ -def:$< |