diff options
| author | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-02-26 20:46:27 +0100 |
| commit | 62cba8cd46a535585a4422daab489f114feab6f3 (patch) | |
| tree | c77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/src/Ice/DynamicLibrary.cpp | |
| parent | updating changelog for ICE-6844 (diff) | |
| download | ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2 ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz ice-62cba8cd46a535585a4422daab489f114feab6f3.zip | |
Windows msbuild build updates
Diffstat (limited to 'cpp/src/Ice/DynamicLibrary.cpp')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index d96b2911e03..5b3a31faa6d 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) { } @@ -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); } - |