From 3270038fb4d2a8cb1634a041ce123116de7e9618 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 17 Aug 2009 23:02:56 +0000 Subject: [PATCH] Force linking of src/osx/core/sockosx.cpp. Without this the file was omitted by linker entirely in the static build and the correct socket manager wasn't used for the GUI applications (see #11030). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/socket.cpp | 5 +++++ src/osx/core/sockosx.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 0bb79b219f..95778390a5 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -2079,4 +2079,9 @@ wxFORCE_LINK_MODULE( socketiohandler ) wxFORCE_LINK_MODULE( mswsocket ) #endif +// and for OSXManagerSetter in the OS X one +#ifdef __WXMAC__ + wxFORCE_LINK_MODULE( osxsocket ) +#endif + #endif // wxUSE_SOCKETS diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp index 6a5928bbb8..0b6b77d0e1 100644 --- a/src/osx/core/sockosx.cpp +++ b/src/osx/core/sockosx.cpp @@ -16,6 +16,7 @@ #include "wx/private/socket.h" #include "wx/unix/private/sockunix.h" #include "wx/apptrait.h" +#include "wx/link.h" #include "wx/osx/core/cfstring.h" // for wxMacWakeUp() only @@ -285,4 +286,7 @@ static struct OSXManagerSetter } } gs_OSXManagerSetter; +// see the relative linker macro in socket.cpp +wxFORCE_LINK_THIS_MODULE( osxsocket ); + #endif // wxUSE_SOCKETS -- 2.47.2