diff options
| author | Jose <jose@zeroc.com> | 2013-01-17 00:19:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-17 00:19:08 +0100 |
| commit | 0fe0ab23fda0af323a26b29bc12d2a6a348fced3 (patch) | |
| tree | 0e5d5873b7df9c7a73b3fa66b6ae8a910dde53bc /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Fixed (ICE-5187) - Glacier2 SessionHelpers cannot load IceSSL plug-in from cu... (diff) | |
| download | ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.tar.bz2 ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.tar.xz ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.zip | |
Added OS X Frameworks
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index b573a7f4388..7dd0ea2fcf3 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -170,8 +170,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef __APPLE__ // - // On OS X fallback to .so and .bundle extensions if the default - // .dylib fails. + // On OS X fallback to .so and .bundle extensions, we also fallback + // to use the library name without an extesion in case is an OS X + // Framework, if the default .dylib fails. // if(!load(lib + ".dylib")) { @@ -182,7 +183,12 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(!load(lib + ".bundle")) { _err = errMsg + "; " + _err; - return 0; + + if(!load(libPath + libName)) + { + _err = errMsg + "; " + _err; + return 0; + } } } _err = ""; |