diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-05-05 19:23:45 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-05-05 19:23:45 -0400 |
| commit | a5bd24845a2720d57a66d81effc59423d723c87c (patch) | |
| tree | 76faa296700b0993deb3aa97323abc904188a681 /cpp/include/IceUtil/Config.h | |
| parent | minor fixes for purify (diff) | |
| download | ice-a5bd24845a2720d57a66d81effc59423d723c87c.tar.bz2 ice-a5bd24845a2720d57a66d81effc59423d723c87c.tar.xz ice-a5bd24845a2720d57a66d81effc59423d723c87c.zip | |
ICE-6481 pragma comment when building static libraries
On windows with VS, pragma comment is now defined when building only when
ICE_BUILDING_<component-name> is not defined. ICE_BUILDING_<component-name>
is defined automatically when <component-name>_API_EXPORTS is defined. When building
static Ice libraries on Windows, please define
ICE_BUILDING_<component-name-being-built>.
ICE_DECLSPEC_EXPORT and ICE_DECLSPEC_IMPORT are now defined all the time on Windows,
and we define the various _API macros to /**/ when ICE_STATIC_LIBS is defined.
Replaced various direct use of ICE_DECLSPEC_EXPORT/ICE_DECLSPEC_IMPORT by
the correct _API macro.
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 471fe9881c5..c834d1c0c3c 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -97,7 +97,7 @@ // Compiler extensions to export and import symbols: see the documentation // for Visual Studio, Solaris Studio and GCC. // -#if defined(_WIN32) && !defined(ICE_STATIC_LIBS) +#if defined(_WIN32) # define ICE_DECLSPEC_EXPORT __declspec(dllexport) # define ICE_DECLSPEC_IMPORT __declspec(dllimport) // @@ -118,8 +118,10 @@ // // Let's use these extensions with IceUtil: // -#ifdef ICE_UTIL_API_EXPORTS +#if defined(ICE_UTIL_API_EXPORTS) # define ICE_UTIL_API ICE_DECLSPEC_EXPORT +#elif defined(ICE_STATIC_LIBS) +# define ICE_UTIL_API /**/ #else # define ICE_UTIL_API ICE_DECLSPEC_IMPORT #endif @@ -173,17 +175,19 @@ # include <TargetConditionals.h> #endif -#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT) +#if !defined(ICE_BUILDING_ICE_UTIL) && defined(ICE_UTIL_API_EXPORTS) +# define ICE_BUILDING_ICE_UTIL +#endif + +#if defined(_MSC_VER) # 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_STATIC_LIBS) -# pragma comment(lib, "IceUtil.lib") -# elif !defined(ICE_UTIL_API_EXPORTS) -# if defined(_DEBUG) +# if !defined(ICE_BUILDING_ICE_UTIL) +# if defined(_DEBUG) && !defined(ICE_OS_WINRT) # pragma comment(lib, "IceUtilD.lib") # else # pragma comment(lib, "IceUtil.lib") |