diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
| commit | b55ce15878456e3d2f0656bcd6abd5a55c6774b1 (patch) | |
| tree | e7e771a3d90ae7295f20bf0622b72c72cc3a85e0 /cpp/include/Slice | |
| parent | Fixed ObjC build (diff) | |
| download | ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.bz2 ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.xz ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.zip | |
Changes for brew, python PyPI packaging and ruby gem packaging.
Diffstat (limited to 'cpp/include/Slice')
| -rw-r--r-- | cpp/include/Slice/Parser.h | 2 | ||||
| -rw-r--r-- | cpp/include/Slice/PythonUtil.h | 2 | ||||
| -rw-r--r-- | cpp/include/Slice/RubyUtil.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 19199e58613..d416ca6f18c 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -23,7 +23,7 @@ // // Automatically link Slice[D].lib with Visual C++ // -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT) # if defined(ICE_STATIC_LIBS) # pragma comment(lib, "Slice.lib") # elif !defined(SLICE_API_EXPORTS) diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h index 8930bc42664..9d5db3c6c99 100644 --- a/cpp/include/Slice/PythonUtil.h +++ b/cpp/include/Slice/PythonUtil.h @@ -56,6 +56,8 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, const std::string& // SLICE_API void printHeader(IceUtilInternal::Output&); +SLICE_API int compile(int, char*[]); + } } diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h index 0095d286c55..4cb97a8826f 100644 --- a/cpp/include/Slice/RubyUtil.h +++ b/cpp/include/Slice/RubyUtil.h @@ -46,6 +46,8 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const // SLICE_API void printHeader(IceUtilInternal::Output&); +SLICE_API int compile(int, char*[]); + } } |