Kaydet (Commit) 9ab9d22f authored tarafından Caolán McNamara's avatar Caolán McNamara

split helper and fix build

Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8
üst a8a3ad1e
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/opengl/GLMHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/bmpacc.hxx> #include <vcl/bmpacc.hxx>
......
/* -*- 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: */
...@@ -11,14 +11,11 @@ ...@@ -11,14 +11,11 @@
#define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
#include <GL/glew.h> #include <GL/glew.h>
#include "glm/glm.hpp"
#include <vcl/vclopengl_dllapi.hxx> #include <vcl/vclopengl_dllapi.hxx>
#include <vcl/bitmapex.hxx> #include <vcl/bitmapex.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <ostream>
class VCLOPENGL_DLLPUBLIC OpenGLHelper class VCLOPENGL_DLLPUBLIC OpenGLHelper
{ {
public: public:
...@@ -41,10 +38,6 @@ public: ...@@ -41,10 +38,6 @@ public:
static float getGLVersion(); 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 #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <vcl/opengl/GLMHelper.hxx>
#include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLHelper.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment