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
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user