From 86b38c2ffa1bfad7e2d7718b3dec28e22c5be8fe Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Wed, 2 Dec 2009 09:36:43 -0330
Subject: Add ability to compile dlls with unique names for each compiler

---
 cpp/src/Ice/DynamicLibrary.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/DynamicLibrary.cpp')

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;
-- 
cgit v1.2.3