zxs-un
/
illumos-port-nspr
mirror of https://github.com/n-hys/nspr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug 50549: Link to ws2_32.lib instead of wsock32.lib under Windows 

because we don't support Windows 95 now. The change was suggested by
Jon Smirl <jonsmirl@mediaone.net> and Robert Story <rstory@tislabs.com>.
r=wtc.
This commit is contained in:
Wan-Teh Chang 2014-03-09 11:04:48 -07:00
parent 79f8bb3218
commit d3ed3627ab
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/prstreams/tests/testprstrm/Makefile.in
View File

@ -150,7 +150,7 @@ else
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
ifeq ($(OS_ARCH), WINNT)
link $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) wsock32.lib -out:$@
link $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) ws2_32.lib -out:$@
else
ifeq ($(OS_ARCH),OS2)
$(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPR) $(LIBPRSTRMS) $(OS_LIBS) $(EXTRA_LIBS)

2
lib/tests/Makefile.in
View File

@ -159,7 +159,7 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
ifeq ($(OS_ARCH), WINNT)
link $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) wsock32.lib -out:$@
link $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) ws2_32.lib -out:$@
else
ifeq ($(OS_ARCH), WINCE)
$(LD) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) ws2.lib -out:$@

4
pr/src/Makefile.in
View File

@ -165,9 +165,9 @@ endif
ifeq ($(OS_ARCH),WINNT)
ifdef NS_USE_GCC
OS_LIBS = -ladvapi32 -lwsock32 -lwinmm
OS_LIBS = -ladvapi32 -lws2_32 -lwinmm
else
OS_LIBS = advapi32.lib wsock32.lib winmm.lib
OS_LIBS = advapi32.lib ws2_32.lib winmm.lib
endif
endif

2
pr/src/cplus/tests/Makefile.in
View File

@ -204,7 +204,7 @@ ifeq ($(OS_TARGET),WIN16)
echo winsock.lib >>w16link
wlink @w16link.
else
link $(LDOPTS) $< $(LIBPR) $(LIBPL) wsock32.lib -out:$@
link $(LDOPTS) $< $(LIBPR) $(LIBPL) ws2_32.lib -out:$@
endif
else
ifeq ($(OS_ARCH),OS2)

4
pr/tests/Makefile.in
View File

@ -206,9 +206,9 @@ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/incl
ifeq ($(OS_ARCH), WINNT)
ifdef NS_USE_GCC
EXTRA_LIBS += -lwsock32
EXTRA_LIBS += -lws2_32
else
EXTRA_LIBS += wsock32.lib
EXTRA_LIBS += ws2_32.lib
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
ifdef PROFILE
LDOPTS += -PROFILE -MAP

2
tools/Makefile.in
View File

@ -167,7 +167,7 @@ ifeq ($(OS_TARGET),WIN16)
echo winsock.lib >>w16link
wlink @w16link.
else
link $(LDOPTS) $< $(LIBPR) $(LIBPLC) wsock32.lib -out:$@
link $(LDOPTS) $< $(LIBPR) $(LIBPLC) ws2_32.lib -out:$@
endif
else
ifeq ($(OS_ARCH),OS2)