Use correct extensions in wxDynamicLibrary::CanonicalizeName() on OS X.
Contrary to the documentation, this function incorrectly appended the .bundle extension on OS X for libraries as well as modules. Fixed to use .dylib for libraries (wxDL_LIBRARY) and continue to use .bundle for loadable modules (wxDL_MODULE). Change GetDllExt() to take optional wxDynamicLibearyCategory argument. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -232,7 +232,7 @@ public:
|
||||
static wxDllType GetProgramHandle();
|
||||
|
||||
// return the platform standard DLL extension (with leading dot)
|
||||
static const wxString& GetDllExt() { return ms_dllext; }
|
||||
static wxString GetDllExt(wxDynamicLibraryCategory cat = wxDL_LIBRARY);
|
||||
|
||||
wxDynamicLibrary() : m_handle(0) { }
|
||||
wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT)
|
||||
@@ -372,9 +372,6 @@ protected:
|
||||
#endif // wxHAVE_DYNLIB_ERROR
|
||||
|
||||
|
||||
// platform specific shared lib suffix.
|
||||
static const wxString ms_dllext;
|
||||
|
||||
// the handle to DLL or NULL
|
||||
wxDllType m_handle;
|
||||
|
||||
|
Reference in New Issue
Block a user