There is no separate vclopengl library since Oct 2014

Change-Id: Ie8ddac5cce6905c3a40350ff60fad24d4da43a66

6 files changed, 11 insertions, 35 deletions

diff --git a/include/vcl/opengl/GLMHelper.hxx b/include/vcl/opengl/GLMHelper.hxx
index 8287c3458346..64e506093c26 100644
--- a/include/vcl/opengl/GLMHelper.hxx
+++ b/include/vcl/opengl/GLMHelper.hxx
@@ -11,13 +11,13 @@
 #define INCLUDED_VCL_GLM_GLMHELPER_HXX
 
 #include "glm/glm.hpp"
-#include <vcl/vclopengl_dllapi.hxx>
+#include <vcl/dllapi.h>
 
 #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);
+VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
+VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
+VCL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
 
 #endif
 
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 56c34c0af5a7..c8f2cb4bfbe7 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -51,7 +51,7 @@ class NSOpenGLView;
 #include <GL/glxext.h>
 #endif
 
-#include <vcl/vclopengl_dllapi.hxx>
+#include <vcl/dllapi.h>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <vcl/window.hxx>
 #include <tools/gen.hxx>
@@ -164,7 +164,7 @@ struct GLWindow
     ~GLWindow();
 };
 
-class VCLOPENGL_DLLPUBLIC OpenGLContext
+class VCL_DLLPUBLIC OpenGLContext
 {
 public:
     OpenGLContext();
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 2f4aec010e76..95c23c8deeaa 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 
 #include <GL/glew.h>
-#include <vcl/vclopengl_dllapi.hxx>
+#include <vcl/dllapi.h>
 #include <vcl/bitmapex.hxx>
 
 #include <rtl/ustring.hxx>
@@ -22,7 +22,7 @@
 #  include <postx.h>
 #endif
 
-class VCLOPENGL_DLLPUBLIC OpenGLHelper
+class VCL_DLLPUBLIC OpenGLHelper
 {
 public:
     static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName, const OString& preamble = "" );
diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx
index 9724eb3d9ffd..dfeb95c076e6 100644
--- a/include/vcl/openglwin.hxx
+++ b/include/vcl/openglwin.hxx
@@ -12,12 +12,12 @@
 
 #include <vcl/event.hxx>
 #include <vcl/syschild.hxx>
-#include <vcl/vclopengl_dllapi.hxx>
+#include <vcl/dllapi.h>
 
 class OpenGLContext;
 class OpenGLWindowImpl;
 
-class VCLOPENGL_DLLPUBLIC IRenderer
+class VCL_DLLPUBLIC IRenderer
 {
 public:
     virtual ~IRenderer() {}
@@ -30,7 +30,7 @@ public:
 };
 
 // pImpl Pattern to avoid linking against OpenGL libs when using the class without the context
-class VCLOPENGL_DLLPUBLIC OpenGLWindow : public vcl::Window
+class VCL_DLLPUBLIC OpenGLWindow : public vcl::Window
 {
 public:
     OpenGLWindow(vcl::Window* pParent);
diff --git a/include/vcl/vclopengl_dllapi.hxx b/include/vcl/vclopengl_dllapi.hxx
deleted file mode 100644
index 707949d0d3b1..000000000000
--- a/include/vcl/vclopengl_dllapi.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- 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_VCLOPENGL_DLLAPI_HXX
-#define INCLUDED_VCL_VCLOPENGL_DLLAPI_HXX
-
-#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: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b3b8d02b76c8..a174b0dc2c40 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_Library_set_include,vcl,\
 
 $(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
-    -DVCLOPENGL_DLLIMPLEMENTATION \
 	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
 	-DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
 	-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \