fixed mmedia contrib to work if libesd is not present

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 1ba9660c9f86334a0d7f6e2c87dab98e013157e5..989138706eb08b7d0f17fcd2257da6e51b403a8e 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -391,17 +391,39 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     
 
 /*static*/
-wxString wxDynamicLibrary::CanonicalizeName(const wxString& name,
-                                            wxDynamicLibraryCategory cat)
+wxString
+wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                   wxDynamicLibraryCategory
+#ifdef __UNIX__
+                                        cat
+#else // !__UNIX__
+                                        WXUNUSED(cat)
+#endif // __UNIX__/!__UNIX__
+                                   )
 {
+    wxString nameCanonic;
+
+    // under Unix the library names usualyl start with "lib" prefix, add it
 #ifdef __UNIX__
-    if ( cat == wxDL_MODULE )
-        return name + GetDllExt();
-    else
-        return wxString(_T("lib")) + name + GetDllExt();
-#else
-    return name + GetDllExt();
-#endif
+    switch ( cat )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") );
+            // fall through
+
+        case wxDL_MODULE:
+            // don't do anything for modules, their names are arbitrary
+            break;
+
+        case wxDL_LIBRARY:
+            // library names should start with "lib" under Unix
+            nameCanonic = _T("lib");
+            break;
+    }
+#endif // __UNIX__
+
+    nameCanonic << name << GetDllExt();
+    return nameCanonic;
 }
 
 /*static*/
@@ -415,7 +437,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
                               wxAppConsole::GetInstance()->GetTraits() : NULL;
         wxASSERT_MSG( traits, 
                _("can't query for GUI plugins name in console applications") );
-        suffix = traits->GetToolkitInfo()->shortName;
+        suffix = traits->GetToolkitInfo().shortName;
     }
 #if wxUSE_UNICODE
     suffix << _T('u');
@@ -440,6 +462,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
         #define wxDLLVER(x,y,z) #x #y #z
     #endif
 #endif
+
     suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
                                            wxRELEASE_NUMBER));
 #undef wxDLLVER