diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-24 16:52:00 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-24 16:52:00 +0000 |
| commit | 0ca603c1bc9a4b3d583a0ad42d4b013d8ea62738 (patch) | |
| tree | 36d2736a54d2a2f7af36102fcc4f0865f72d3491 /win32/setup.mak | |
| parent | 32a75c9dcb00864e24acc5f8e76e987300addf27 (diff) | |
* mkconfig.rb: merge multiple entries to an entry with multiple lines.
* lib/mkmf.rb: allow a series of commands to link.
* win32/Makefile.sub: embed manifests.
* win32/setup.mak: suffix OS name by runtime version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index ab7960090e..e066805bd5 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -69,7 +69,7 @@ int runtime_name() { char libpath[MAXPATHLEN+1]; - char *p, *base = NULL; + char *p, *base = NULL, *ver = NULL; HMODULE msvcrt = NULL; MEMORY_BASIC_INFORMATION m; @@ -87,9 +87,17 @@ runtime_name() if (!base) return 0; if (p = strchr(base, '.')) *p = '\0'; for (p = base; *p; p = CharNext(p)) { - if (isascii(*p) && isupper(*p)) + if (!isascii(*p)) continue; + if (isupper(*p)) { *p = tolower(*p); + } + if (!isdigit(*p)) { + ver = NULL; + } else if (!ver) { + ver = p; + } } + if (ver) printf("OS = $$(OS)_%s\n", ver); printf("RT = %s\n", base); return 1; } @@ -159,4 +167,5 @@ $(CPU) = $(PROCESSOR_LEVEL) $(BANG)include $$(srcdir)/win32/Makefile.sub << + @$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status @echo type `$(MAKE)' to make ruby for $(OS). |