X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f73bc315aac67f087106454a7f23a8a0d3a4bda2..ae18f6104cacc65f0a0a9f9c7d61a0d3944e639d:/src/common/dynlib.cpp diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index c7e7a28ed9..f8d9e8db9b 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; @@ -353,7 +358,11 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const symbol = 0; #elif defined(__WINDOWS__) +#ifdef __WXWINCE__ + symbol = (void*) ::GetProcAddress( m_handle, name ); +#else symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() ); +#endif #else #error "runtime shared lib support not implemented" @@ -400,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 ) {