diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-12-19 14:11:20 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-12-19 14:11:20 -0500 |
| commit | b0c5e55738e9050fcf8d12c563866c9994dcd312 (patch) | |
| tree | 9e3220b869f7513ace58e5b29229bb118027e4cc /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | ICE-4938: support for compact IDs (diff) | |
| download | ice-b0c5e55738e9050fcf8d12c563866c9994dcd312.tar.bz2 ice-b0c5e55738e9050fcf8d12c563866c9994dcd312.tar.xz ice-b0c5e55738e9050fcf8d12c563866c9994dcd312.zip | |
Fixed ICE-4986. The new convention for DLL names with compiler name is: name<version>[d]_<compiler>.dll
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 4fa7f1499e2..7763b37545c 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -128,6 +128,12 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib += libName; + lib += version; + +# if defined(_DEBUG) && !defined(__MINGW32__) + lib += 'd'; +# endif + # ifdef COMPSUFFIX // // If using unique dll names we need to add compiler suffix @@ -140,12 +146,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc } # endif - lib += version; - -# if defined(_DEBUG) && !defined(__MINGW32__) - lib += 'd'; -# endif - lib += ".dll"; #elif defined(__APPLE__) lib += "lib" + libName; |