diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-12-24 15:16:05 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-12-24 15:16:05 -0500 |
| commit | 3ce5fac0e53b89d9343a9b4f4f7b7f49ed6b3726 (patch) | |
| tree | ef6a85ebd9d78f5af997983a8488bafe6c06a276 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | Fixes for slice2confluence for Ice 3.5, hack to make Ice::Instrumentation gen... (diff) | |
| download | ice-3ce5fac0e53b89d9343a9b4f4f7b7f49ed6b3726.tar.bz2 ice-3ce5fac0e53b89d9343a9b4f4f7b7f49ed6b3726.tar.xz ice-3ce5fac0e53b89d9343a9b4f4f7b7f49ed6b3726.zip | |
mingw builds now use the same COMPSUFFIX format as VC++ builds.
DynamicLibrary::load now adds COMPSUFFIX all the time on Windows when COMPSUFFIX is defined
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 7763b37545c..1b7c34e99cc 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -127,7 +127,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib += libName; - lib += version; # if defined(_DEBUG) && !defined(__MINGW32__) @@ -135,15 +134,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc # endif # ifdef COMPSUFFIX - // - // 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 += COMPSUFFIX; - } + lib += COMPSUFFIX; # endif lib += ".dll"; |