diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 10:35:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-04 10:35:28 +0000 |
| commit | 6e7d7bf5dd4af81ad71fba0be1346f14acafe201 (patch) | |
| tree | 18289b494f7ff636d515b1958f780c2ea506b236 /win32/Makefile.sub | |
| parent | f45caa14f6e239afac1eb66910a2d1f6fd59abf2 (diff) | |
* include/ruby/win32.h (WIN95): moved to config.h
* win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib
is available.
* win32/setup.mak (-unicows-): checks if unicows.lib is available.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d469cb1243..b79c351db9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -332,6 +332,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #if _MSC_VER != $(MSC_VER) #error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected. #endif +!if defined(HAVE_UNICOWS) && "$(MACHINE)" == "x86" +#define WIN95 1 +!endif #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 @@ -483,7 +486,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define RUBY_JMP_BUF jmp_buf #define inline __inline #define NEED_IO_SEEK_BETWEEN_RW 1 -!if "$(PROCESSOR_ARCHITECTURE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define STACK_GROW_DIRECTION -1 !endif #define CANONICALIZATION_FOR_MATHN 1 |