From e6717679c09420842d7450dd60a55751e231e8d9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 5 Jun 2008 03:26:21 +0000 Subject: 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_5@16829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'win32/Makefile.sub') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index db737332c2..4abfa76433 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: -- cgit v1.2.3