Found the RIGHT place to make the __unix__ fix.
Undoing the other changes I just made. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d4b67f95d2
commit
9e4b2f1c57
@ -31,7 +31,7 @@
|
||||
// System dependent include
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#if defined(__UNIX__) || defined(__unix__)
|
||||
#if defined(__UNIX__)
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
@ -71,7 +71,7 @@ wxLibrary::wxLibrary(void *handle)
|
||||
wxLibrary::~wxLibrary()
|
||||
{
|
||||
if (m_handle && m_destroy) {
|
||||
#if defined(__UNIX__) || defined(__unix__)
|
||||
#if defined(__UNIX__)
|
||||
dlclose(m_handle);
|
||||
#endif
|
||||
#ifdef __WINDOWS__
|
||||
@ -115,7 +115,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
|
||||
|
||||
void *wxLibrary::GetSymbol(const wxString& symbname)
|
||||
{
|
||||
#if defined(__UNIX__) || defined(__unix__)
|
||||
#if defined(__UNIX__)
|
||||
return dlsym(m_handle, WXSTRINGCAST symbname);
|
||||
#endif
|
||||
#ifdef __WINDOWS__
|
||||
@ -158,7 +158,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
|
||||
old_sm_first = wxClassInfo::sm_first;
|
||||
wxClassInfo::sm_first = NULL;
|
||||
|
||||
#if defined(__UNIX__) || defined(__unix__)
|
||||
#if defined(__UNIX__)
|
||||
lib_name.Prepend("./lib");
|
||||
lib_name += ".so";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user