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/slice2objc | |
| 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/slice2objc')
| -rw-r--r-- | cpp/src/slice2objc/Gen.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index a8c6b825ae5..36cd2c990c2 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -759,6 +759,8 @@ Slice::Gen::generate(const UnitPtr& p) _H << nl << "#ifndef " << _dllExport; _H << nl << "# ifdef " << _dllExport << "_EXPORTS"; _H << nl << "# define " << _dllExport << " ICE_DECLSPEC_EXPORT"; + _H << nl << "# elif defined(ICE_STATIC_LIBS)"; + _H << nl << "# define " << _dllExport << " /**/"; _H << nl << "# else"; _H << nl << "# define " << _dllExport << " ICE_DECLSPEC_IMPORT"; _H << nl << "# endif"; |