Only use wxFORCE_LINK_MODULE() in mediaplayer sample in static build.

The linking optimization this macro protects against can't happen when using
DLL and so using it is at best useless and actually harmful (because it
doesn't contain the correct DLL export declarations) in the latter case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 037f2fd8aa814149beac4d66a8325e1c3f40d277..e06f6d17330a3d8041f9fd4b369f03ce2e030172 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -71,12 +71,12 @@
 // they may be discarded by the linker (this definitely happens with MSVC) so
 // force linking them. You don't have to do this in your code if you don't plan
 // to use them, of course.
 // they may be discarded by the linker (this definitely happens with MSVC) so
 // force linking them. You don't have to do this in your code if you don't plan
 // to use them, of course.

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(WXUSINGDLL)

     #include "wx/link.h"
     wxFORCE_LINK_MODULE(wxmediabackend_am)
     wxFORCE_LINK_MODULE(wxmediabackend_qt)
     wxFORCE_LINK_MODULE(wxmediabackend_wmp10)
     #include "wx/link.h"
     wxFORCE_LINK_MODULE(wxmediabackend_am)
     wxFORCE_LINK_MODULE(wxmediabackend_qt)
     wxFORCE_LINK_MODULE(wxmediabackend_wmp10)

-#endif // __WXMSW__
+#endif // static wxMSW build

 
 #ifndef __WXMSW__
     #include "../sample.xpm"
 
 #ifndef __WXMSW__
     #include "../sample.xpm"