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

Merge pull request #737 from eligovision/OpenSceneGraph-3.6_android

Browse Source 
osgDB::DynamicLibrary: local lib loading on Android fixed
This commit is contained in:
OpenSceneGraph git repository 2019-04-11 12:42:22 +01:00 committed by GitHub
commit 1c6fd4da9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgDB/DynamicLibrary.cpp
View File

@ -113,6 +113,11 @@ DynamicLibrary::HANDLE DynamicLibrary::getLibraryHandle( const std::string& libr
return handle; return handle;
#else // other unix #else // other unix
#if defined(__ANDROID__)
// Library can be found in APK/lib/armeabi-v7a etc.
// Should not be prefaced with './'
std::string localLibraryName = libraryName;
#else
// dlopen will not work with files in the current directory unless // dlopen will not work with files in the current directory unless
// they are prefaced with './' (DB - Nov 5, 2003). // they are prefaced with './' (DB - Nov 5, 2003).
std::string localLibraryName; std::string localLibraryName;
@ -120,6 +125,7 @@ DynamicLibrary::HANDLE DynamicLibrary::getLibraryHandle( const std::string& libr
localLibraryName = "./" + libraryName; localLibraryName = "./" + libraryName;
else else
localLibraryName = libraryName; localLibraryName = libraryName;
#endif
handle = dlopen( localLibraryName.c_str(), RTLD_LAZY | RTLD_GLOBAL); handle = dlopen( localLibraryName.c_str(), RTLD_LAZY | RTLD_GLOBAL);
if( handle == NULL ) if( handle == NULL )