diff options
Diffstat (limited to 'cpp/include/Glacier2/Config.h')
| -rw-r--r-- | cpp/include/Glacier2/Config.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h index cf53d71c908..79a4144cf95 100644 --- a/cpp/include/Glacier2/Config.h +++ b/cpp/include/Glacier2/Config.h @@ -11,28 +11,22 @@ #define GLACIER2_CONFIG_H // -// Automatically link with Glacier2[D].lib +// Automatically link with Glacier2[D|++11|++11D].lib // #if !defined(ICE_BUILDING_GLACIER2) && defined(GLACIER2_API_EXPORTS) # define ICE_BUILDING_GLACIER2 #endif -#ifdef _MSC_VER -# if !defined(ICE_BUILDING_GLACIER2) -# if defined(_DEBUG) && !defined(ICE_OS_WINRT) -# pragma comment(lib, "Glacier2D.lib") -# else -# pragma comment(lib, "Glacier2.lib") -# endif -# endif +#if defined(_MSC_VER) && !defined(ICE_BUILDING_GLACIER2) +# pragma comment(lib, ICE_LIBNAME("Glacier2")) #endif #ifndef GLACIER2_API -# ifdef GLACIER2_API_EXPORTS -# define GLACIER2_API ICE_DECLSPEC_EXPORT -# elif defined(ICE_STATIC_LIBS) +# if defined(ICE_STATIC_LIBS) # define GLACIER2_API /**/ +# elif defined(GLACIER2_API_EXPORTS) +# define GLACIER2_API ICE_DECLSPEC_EXPORT # else # define GLACIER2_API ICE_DECLSPEC_IMPORT # endif |