diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-21 14:37:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-21 14:50:15 +0100 |
| commit | 9ab9d22f820831e16551f90105edaea5319c528e (patch) | |
| tree | 6d0bf123fdb2b008f66aabd338b44760fbd44e17 | |
| parent | a8a3ad1e5f2c2539aae8067a3506a896b83389de (diff) | |
split helper and fix build
Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8
| -rw-r--r-- | chart2/source/view/main/3DChartObjects.cxx | 1 | ||||
| -rw-r--r-- | include/vcl/opengl/GLMHelper.hxx | 24 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLHelper.hxx | 7 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 1 |
4 files changed, 26 insertions, 7 deletions
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index c5df68773d72..9786c00c1e61 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -11,6 +11,7 @@ #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/opengl/GLMHelper.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/bmpacc.hxx> diff --git a/include/vcl/opengl/GLMHelper.hxx b/include/vcl/opengl/GLMHelper.hxx new file mode 100644 index 000000000000..8287c3458346 --- /dev/null +++ b/include/vcl/opengl/GLMHelper.hxx @@ -0,0 +1,24 @@ +/* -*- 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_GLM_GLMHELPER_HXX +#define INCLUDED_VCL_GLM_GLMHELPER_HXX + +#include "glm/glm.hpp" +#include <vcl/vclopengl_dllapi.hxx> + +#include <ostream> + +VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix); +VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos); +VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index 87a71fac5ab9..f80d34b887fb 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -11,14 +11,11 @@ #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX #include <GL/glew.h> -#include "glm/glm.hpp" #include <vcl/vclopengl_dllapi.hxx> #include <vcl/bitmapex.hxx> #include <rtl/ustring.hxx> -#include <ostream> - class VCLOPENGL_DLLPUBLIC OpenGLHelper { public: @@ -41,10 +38,6 @@ public: static float getGLVersion(); }; -VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix); -VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos); -VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 0629d90b88a6..84a1399fc296 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <vcl/opengl/GLMHelper.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <osl/file.hxx> |