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/src/IceXML | |
| 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/src/IceXML')
| -rw-r--r-- | cpp/src/IceXML/Parser.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/IceXML/Parser.h b/cpp/src/IceXML/Parser.h index c8f1f4a8bbb..f5de9291968 100644 --- a/cpp/src/IceXML/Parser.h +++ b/cpp/src/IceXML/Parser.h @@ -20,6 +20,8 @@ #ifndef ICE_XML_API # ifdef ICE_XML_API_EXPORTS # define ICE_XML_API ICE_DECLSPEC_EXPORT +# elif defined(ICE_STATIC_LIBS) +# define ICE_XML_API /**/ # else # define ICE_XML_API ICE_DECLSPEC_IMPORT # endif @@ -28,11 +30,14 @@ // // Automatically link IceXML[D].lib with Visual C++ // + +#if !defined(ICE_BUILDING_ICE_XML) && defined(ICE_XML_API_EXPORTS) +# define ICE_BUILDING_ICE_XML +#endif + #ifdef _MSC_VER -# if defined(ICE_STATIC_LIBS) -# pragma comment(lib, "IceXML.lib") -# elif !defined(ICE_XML_API_EXPORTS) -# if defined(_DEBUG) +# if !defined(ICE_BUILDING_ICE_XML) +# if defined(_DEBUG) && !defined(ICE_OS_WINRT) # pragma comment(lib, "IceXMLD.lib") # else # pragma comment(lib, "IceXML.lib") |