Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force linking of src/osx/core/sockosx.cpp.

Browse Source 
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:
Vadim Zeitlin
2009-08-17 23:02:56 +00:00
parent 6bcc1145fe
commit 3270038fb4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/socket.cpp
View File

@@ -2079,4 +2079,9 @@ wxFORCE_LINK_MODULE( socketiohandler )
wxFORCE_LINK_MODULE( mswsocket ) wxFORCE_LINK_MODULE( mswsocket )
#endif #endif
// and for OSXManagerSetter in the OS X one
#ifdef __WXMAC__
wxFORCE_LINK_MODULE( osxsocket )
#endif
#endif // wxUSE_SOCKETS #endif // wxUSE_SOCKETS

4
src/osx/core/sockosx.cpp
View File

@@ -16,6 +16,7 @@
#include "wx/private/socket.h" #include "wx/private/socket.h"
#include "wx/unix/private/sockunix.h" #include "wx/unix/private/sockunix.h"
#include "wx/apptrait.h" #include "wx/apptrait.h"
#include "wx/link.h"
#include "wx/osx/core/cfstring.h" // for wxMacWakeUp() only #include "wx/osx/core/cfstring.h" // for wxMacWakeUp() only
@@ -285,4 +286,7 @@ static struct OSXManagerSetter
} }
} gs_OSXManagerSetter; } gs_OSXManagerSetter;
// see the relative linker macro in socket.cpp
wxFORCE_LINK_THIS_MODULE( osxsocket );
#endif // wxUSE_SOCKETS #endif // wxUSE_SOCKETS