FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed loading of dynamic libraries with dlopen if the library is

Browse Source 
in the current directory
This commit is contained in:
Don BURNS
2003-11-06 04:08:53 +00:00
parent e043f6c89d
commit b7eeeea8d1
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/osgDB/DynamicLibrary.cpp
View File

@@ -32,6 +32,7 @@
#include <osgDB/DynamicLibrary>
#include <osgDB/FileUtils>
#include <osgDB/FileNameUtils>
using namespace osg;
using namespace osgDB;
@@ -125,9 +126,17 @@ DynamicLibrary::getLibraryHandle( const std::string& libraryName)
BIND_DEFERRED|BIND_FIRST|BIND_VERBOSE, 0);
return handle;
#else // other unix
handle = dlopen( libraryName.c_str(), RTLD_LAZY | RTLD_GLOBAL);
// dlopen will not work with files in the current directory unless
// they are prefaced with './' (DB - Nov 5, 2003).
std::string localLibraryName;
if( libraryName == osgDB::getSimpleFileName( libraryName ) )
localLibraryName = "./" + libraryName;
else
localLibraryName = libraryName;
handle = dlopen( localLibraryName.c_str(), RTLD_LAZY | RTLD_GLOBAL);
if( handle == NULL )
printf( "dlopen: %s\n", dlerror() );
notify(WARN) << "DynamicLibrary::getLibraryHandle( "<< libraryName << ") - dlopen(): " << dlerror() << std::endl;
#endif
return handle;
}