Only auto-link wsock32.dll if net library is used.
Otherwise linking with it can create problems with the code using other network libraries, which link with ws2_32.dll (Winsock 2). See #15562. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -148,6 +148,9 @@
|
||||
#pragma comment(lib, wxWX_LIB_NAME("base", ""))
|
||||
|
||||
#ifndef wxNO_NET_LIB
|
||||
#ifndef WXUSINGDLL
|
||||
#pragma comment(lib, "wsock32")
|
||||
#endif
|
||||
#pragma comment(lib, wxBASE_LIB_NAME("net"))
|
||||
#endif
|
||||
#ifndef wxNO_XML_LIB
|
||||
@@ -235,7 +238,6 @@
|
||||
#pragma comment(lib, "uuid")
|
||||
#pragma comment(lib, "rpcrt4")
|
||||
#pragma comment(lib, "advapi32")
|
||||
#pragma comment(lib, "wsock32")
|
||||
#if wxUSE_URL_NATIVE
|
||||
#pragma comment(lib, "wininet")
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user