diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-03-14 22:08:15 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-03-14 22:08:15 +0100 |
| commit | 28469999d1d228db04c326398d84cf7034a7f391 (patch) | |
| tree | cdd9f0d0ed1fe22b0c67d86c102b8a33092178b9 /include | |
| parent | be147e18e738d3372924c0f6b9c99e2740bdc16a (diff) | |
Define dllapi for vclopengl
Change-Id: I0815dbf9f580e8fa092ebf485a60df61e2fdf15a
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/OpenGLContext.hxx | 3 | ||||
| -rwxr-xr-x | include/vcl/OpenGLRender.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/vclopengl_dllapi.hxx | 23 |
3 files changed, 28 insertions, 3 deletions
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx index cc7a3e7185fc..373156825e10 100644 --- a/include/vcl/OpenGLContext.hxx +++ b/include/vcl/OpenGLContext.hxx @@ -10,9 +10,10 @@ #ifndef VCL_OPENGL_CONTEXT_HXX #define VCL_OPENGL_CONTEXT_HXX +#include <vcl/vclopengl_dllapi.hxx> #include <vcl/OpenGLRender.hxx> -class VCL_DLLPUBLIC OpenGLContext +class VCLOPENGL_DLLPUBLIC OpenGLContext { public: bool init(OpenGLRender& rGLRender); diff --git a/include/vcl/OpenGLRender.hxx b/include/vcl/OpenGLRender.hxx index 2f7903a23330..022cac8ab0a8 100755 --- a/include/vcl/OpenGLRender.hxx +++ b/include/vcl/OpenGLRender.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/drawing/HomogenMatrix3.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <vcl/font.hxx> +#include <vcl/vclopengl_dllapi.hxx> #if defined( _WIN32 ) @@ -93,7 +94,7 @@ typedef std::vector<GLfloat> PieSegment2DPointList; typedef std::vector<GLfloat> PointList; /// Holds the information of our new child window -struct VCL_DLLPUBLIC GLWindow +struct VCLOPENGL_DLLPUBLIC GLWindow { #if defined( _WIN32 ) HWND hWnd; @@ -143,7 +144,7 @@ struct VCL_DLLPUBLIC GLWindow } }; -class VCL_DLLPUBLIC OpenGLRender +class VCLOPENGL_DLLPUBLIC OpenGLRender { public: OpenGLRender(com::sun::star::uno::Reference< diff --git a/include/vcl/vclopengl_dllapi.hxx b/include/vcl/vclopengl_dllapi.hxx new file mode 100644 index 000000000000..0b3cac657c38 --- /dev/null +++ b/include/vcl/vclopengl_dllapi.hxx @@ -0,0 +1,23 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_VCL_INC_VCLOPENGL_DLLAPI_H +#define INCLUDED_VCL_INC_VCLOPENGL_DLLAPI_H + +#include "sal/types.h" + +#if defined(VCLOPENGL_DLLIMPLEMENTATION) +#define VCLOPENGL_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define VCLOPENGL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |