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/IceGrid/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/IceGrid/Config.h')
-rw-r--r-- | cpp/include/IceGrid/Config.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h index c86a38ef3cf..962d300d201 100644 --- a/cpp/include/IceGrid/Config.h +++ b/cpp/include/IceGrid/Config.h @@ -11,21 +11,15 @@ #define ICE_GRID_CONFIG_H // -// Automatically link with IceGrid[D].lib +// Automatically link with IceGrid[D|++11|++11D].lib // #if !defined(ICE_BUILDING_ICE_GRID) && defined(ICE_GRID_API_EXPORTS) # define ICE_BUILDING_ICE_GRID #endif -#ifdef _MSC_VER -# if !defined(ICE_BUILDING_ICE_GRID) -# if defined(_DEBUG) && !defined(ICE_OS_WINRT) -# pragma comment(lib, "IceGridD.lib") -# else -# pragma comment(lib, "IceGrid.lib") -# endif -# endif +#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_GRID) +# pragma comment(lib, ICE_LIBNAME("IceGrid")) #endif #endif |