X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffcb4ee424061633cedc1c0ba6c04180d5048da9..d5f7923b9ef3f610ec400d07bda7e53b9e0ef543:/src/common/dynlib.cpp?ds=sidebyside

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index ab4178d9a0..023ff4fe2a 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -153,9 +153,13 @@ void *dlsym(void *handle, const char *symbol)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");
 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".dylib");
     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif
@@ -326,6 +330,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     bool     failed = FALSE;
     void    *symbol = 0;
 
+    wxUnusedVar(symbol);
 #if defined(__WXMAC__) && !defined(__DARWIN__)
     Ptr                 symAddress;
     CFragSymbolClass    symClass;
@@ -404,7 +409,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 {
     wxString nameCanonic;
 
-    // under Unix the library names usualyl start with "lib" prefix, add it
+    // under Unix the library names usually start with "lib" prefix, add it
 #ifdef __UNIX__
     switch ( cat )
     {
@@ -491,14 +496,21 @@ wxString wxDynamicLibrary::GetPluginsDirectory()
 {
 #ifdef __UNIX__
     wxString format = wxGetInstallPrefix();
+    wxString dir;
     format << wxFILE_SEP_PATH
            << wxT("lib") << wxFILE_SEP_PATH
            << wxT("wx") << wxFILE_SEP_PATH
+#if (wxMINOR_VERSION % 2) == 0
            << wxT("%i.%i");
-    wxString dir;
     dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
-    return dir;
 #else
+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
+
+#else // ! __UNIX__
     return wxEmptyString;
 #endif
 }