diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-12-02 09:36:43 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-12-02 09:36:43 -0330 |
| commit | 86b38c2ffa1bfad7e2d7718b3dec28e22c5be8fe (patch) | |
| tree | 3bf626b6302eadec180cb6901c4932a502b49773 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Bug 4399 - failure in test/Ice/invoke (diff) | |
| download | ice-86b38c2ffa1bfad7e2d7718b3dec28e22c5be8fe.tar.bz2 ice-86b38c2ffa1bfad7e2d7718b3dec28e22c5be8fe.tar.xz ice-86b38c2ffa1bfad7e2d7718b3dec28e22c5be8fe.zip | |
Add ability to compile dlls with unique names for each compiler
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index d4f9aea6aba..07293a65e15 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -90,19 +90,24 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc string lib; #ifdef _WIN32 - lib = libName + version; -#if defined(_MSC_VER) && (_MSC_VER < 1300) + lib = libName; + +# 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"; + lib += "vc60_"; } -#endif +# endif + + lib += version; + # ifdef _DEBUG lib += 'd'; # endif + lib += ".dll"; #elif defined(__APPLE__) lib = "lib" + libName; |