X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCAM%2FCAM_Application.cxx;h=59a7f7ed82a5886bc30d9bbfcc00abb42cb586af;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=473afae69e8a1dc5acbf4d43090a8d91d987dce6;hpb=d6bd12111347879cd8dbe1a15ac4d6ba32ce0d6b;p=modules%2Fgui.git diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx index 473afae69..59a7f7ed8 100755 --- a/src/CAM/CAM_Application.cxx +++ b/src/CAM/CAM_Application.cxx @@ -335,7 +335,7 @@ CAM_Module* CAM_Application::loadModule( const QString& modName, const bool show getVersion = (GET_VERSION_FUNC)::GetProcAddress( modLib, GET_VERSION_NAME ); } #else - void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY ); + void* modLib = dlopen( libName.toLatin1(), RTLD_LAZY | RTLD_GLOBAL ); if ( !modLib ) err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() ); else @@ -771,8 +771,10 @@ void CAM_Application::readModuleList() if ( !modLibrary.isEmpty() ) { modLibrary = SUIT_Tools::file( modLibrary.trimmed() ); -#ifdef WIN32 +#if defined(WIN32) QString libExt = QString( "dll" ); +#elif defined(__APPLE__) + QString libExt = QString( "dylib" ); #else QString libExt = QString( "so" ); #endif