diff options
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index a62fe7093df..155bc3b0fe1 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -22,7 +22,7 @@ using namespace std; IceUtil::Shared* IceInternal::upCast(DynamicLibrary* p) { return p; } IceUtil::Shared* IceInternal::upCast(DynamicLibraryList* p) { return p; } -IceInternal::DynamicLibrary::DynamicLibrary() : +IceInternal::DynamicLibrary::DynamicLibrary() : _hnd(0) { } @@ -89,7 +89,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc if(comma == string::npos) { libName = libSpec; -# if defined(ICE_CPP11) && defined(__GLIBCXX__) +# if defined(ICE_CPP11_MAPPING) && !defined(_WIN32) libName += "++11"; # endif if(useIceVersion) @@ -119,7 +119,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc return 0; } libName = libSpec.substr(0, comma); -# if defined(ICE_CPP11) && defined(__GLIBCXX__) +# if defined(ICE_CPP11_MAPPING) && !defined(_WIN32) libName += "++11"; # endif version = libSpec.substr(comma + 1); @@ -130,6 +130,13 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib += libName; lib += version; +# ifdef ICE_OS_WINRT + lib += "uwp"; +# endif + +# ifdef ICE_CPP11_MAPPING + lib += "++11"; +# endif # if defined(_DEBUG) && !defined(__MINGW32__) lib += 'd'; @@ -278,4 +285,3 @@ IceInternal::DynamicLibraryList::add(const DynamicLibraryPtr& library) { _libraries.push_back(library); } - |