diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-12-02 14:11:36 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-12-02 14:11:36 -0330 |
| commit | 58a2c31f45a81ec54b400ba73070fc23581e9705 (patch) | |
| tree | 9b61d1fe608542223d8f4ffb75c929c86a7c5a33 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | improving "make clean" for mono (diff) | |
| download | ice-58a2c31f45a81ec54b400ba73070fc23581e9705.tar.bz2 ice-58a2c31f45a81ec54b400ba73070fc23581e9705.tar.xz ice-58a2c31f45a81ec54b400ba73070fc23581e9705.zip | |
Make loading of IceSSL when using unique names easier
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 07293a65e15..e89ef1fb789 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -92,13 +92,15 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib = libName; -# if defined(_MSC_VER) && (_MSC_VER < 1300) +# ifdef COMPSUFFIX // - // Special case to deal with the naming of IceSSL VC6 DLL. + // If using unique dll names we need to add compiler suffix + // to IceSSL so that we do not have to use compiler suffix + // in the configuration. // if(IceUtilInternal::toLower(libName) == "icessl") { - lib += "vc60_"; + lib += COMPSUFFIX; } # endif |