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/Slice/CPlusPlusUtil.cpp | |
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/Slice/CPlusPlusUtil.cpp')
-rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index 95b34a2ec66..e50b4908eab 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -441,6 +441,8 @@ Slice::printDllExportStuff(Output& out, const string& dllExport) out << "\n#ifndef " << dllExport; out << "\n# ifdef " << dllExport << "_EXPORTS"; out << "\n# define " << dllExport << " ICE_DECLSPEC_EXPORT"; + out << "\n# elif defined(ICE_STATIC_LIBS)"; + out << "\n# define " << dllExport << " /**/"; out << "\n# else"; out << "\n# define " << dllExport << " ICE_DECLSPEC_IMPORT"; out << "\n# endif"; |