diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-05 03:28:21 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-05 03:28:21 +0000 |
| commit | 82c551e974b58489f82268bda749939dc40b0c65 (patch) | |
| tree | f72d20b8e62a308b606864adb707ead9030c3d64 /win32/Makefile.sub | |
| parent | eca461acaaae50394a9583481663baf6e3b103ae (diff) | |
merge revision(s) 13601:
* win32/win32.c (init_env): initialize HOME and USER environment
variables unless set. [ruby-core:12328] (merge from trunk)
* win32/win32.c (NtInitialize, getlogin): ditto.
* configure.in, win32/Makefile.sub (LIBS): need to link shell32
library for SH* functions on mswin32 and mingw32.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e555399b2c..a6df99dd1f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -130,11 +130,13 @@ RFLAGS = -r !if !defined(EXTLIBS) EXTLIBS = !endif +LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib !if !defined(USE_WINSOCK2) -LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS) +LIBS = $(LIBS) wsock32.lib !else -LIBS = oldnames.lib user32.lib advapi32.lib ws2_32.lib $(EXTLIBS) +LIBS = $(LIBS) ws2_32.lib !endif +LIBS = $(LIBS) $(EXTLIBS) MISSING = acosh.obj crypt.obj erf.obj win32.obj ARFLAGS = -machine:$(MACHINE) -out: |