diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-11-16 11:31:15 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-11-16 11:31:15 -0330 |
| commit | 0be6a805fef10d47936f768e00176a55806be7b1 (patch) | |
| tree | acc48fd13940bb7ff23472cbd4da497b51b39a64 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | 4026 - Add config-in-registry support to IceServiceInstall (diff) | |
| download | ice-0be6a805fef10d47936f768e00176a55806be7b1.tar.bz2 ice-0be6a805fef10d47936f768e00176a55806be7b1.tar.xz ice-0be6a805fef10d47936f768e00176a55806be7b1.zip | |
Make third party a single installer
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 6f69880d177..d4f9aea6aba 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <Ice/DynamicLibrary.h> +#include <IceUtil/StringUtil.h> #ifndef _WIN32 # include <dlfcn.h> @@ -90,6 +91,15 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib = libName + version; +#if defined(_MSC_VER) && (_MSC_VER < 1300) + // + // Special case to deal with the naming of IceSSL VC6 DLL. + // + if(IceUtilInternal::toLower(libName) == "icessl") + { + lib += "_vc6"; + } +#endif # ifdef _DEBUG lib += 'd'; # endif |