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/include/IceUtil/Config.h | |
| 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/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 7aaf06fc728..9f6541b225c 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -190,16 +190,44 @@ # if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT)) # error "Only multi-threaded DLL libraries can be used with Ice!" # endif -// -// Automatically link with IceUtil[D].lib -// -# if !defined(ICE_BUILDING_ICE_UTIL) -# if defined(_DEBUG) && !defined(ICE_OS_WINRT) -# pragma comment(lib, "IceUtilD.lib") + +# ifdef ICE_CPP11_MAPPING +# if defined(_DEBUG) +# if defined(ICE_OS_WINRT) +# define ICE_LIBNAME(NAME) NAME "37uwp++11D.lib" +# else +# define ICE_LIBNAME(NAME) NAME "37++11D.lib" +# endif +# else +# if defined(ICE_OS_WINRT) +# define ICE_LIBNAME(NAME) NAME "37uwp++11.lib" +# else +# define ICE_LIBNAME(NAME) NAME "37++11.lib" +# endif +# endif +# else +# if defined(_DEBUG) +# if defined(ICE_OS_WINRT) +# define ICE_LIBNAME(NAME) NAME "37uwpD.lib" +# else +# define ICE_LIBNAME(NAME) NAME "37D.lib" +# endif # else -# pragma comment(lib, "IceUtil.lib") +# if defined(ICE_OS_WINRT) +# define ICE_LIBNAME(NAME) NAME "37uwp.lib" +# else +# define ICE_LIBNAME(NAME) NAME "37.lib" +# endif # endif # endif + +// +// Automatically link with IceUtil[D|++11|++11D].lib +// + +# ifndef ICE_BUILDING_ICE_UTIL +# pragma comment(lib, ICE_LIBNAME("IceUtil")) +# endif #endif namespace IceUtil |