diff options
Diffstat (limited to 'cpp/src/Ice')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 13 | ||||
| -rw-r--r-- | cpp/src/Ice/Makefile.mak | 2 |
2 files changed, 10 insertions, 5 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; diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index a53d0042b70..2eeef01f381 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\ice$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\ice$(SOVERSION)$(COMPSUFFIX)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\ice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
|