[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - 2 commits - vcl/inc vcl/Library_vclopengl.mk vcl/osx

[Markus Mohrhard]

 vcl/Library_vclopengl.mk  |    9 ++++++---
 vcl/inc/OpenGLWrapper.hxx |    2 --
 vcl/osx/OpenGLWrapper.cxx |    4 ----
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 8a103607586211dfacb2d815f2a7bf8f2e41d8a4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 1 22:14:59 2014 +0200

    remove unused method
    
    Change-Id: I17d3e3fa4671d0004e2d7918ea3bcad1a7bcd2b5

diff --git a/vcl/inc/OpenGLWrapper.hxx b/vcl/inc/OpenGLWrapper.hxx
index 6911c33..0b90b41 100644
--- a/vcl/inc/OpenGLWrapper.hxx
+++ b/vcl/inc/OpenGLWrapper.hxx
@@ -23,8 +23,6 @@ public:
     static void swapBuffers(NSOpenGLView* pView);
     static void makeCurrent(NSOpenGLView* pView);
     static void resetCurrent();
-
-    static void init(NSOpenGLView* pView);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/OpenGLWrapper.cxx b/vcl/osx/OpenGLWrapper.cxx
index dc9ad7a..fc008f4 100644
--- a/vcl/osx/OpenGLWrapper.cxx
+++ b/vcl/osx/OpenGLWrapper.cxx
@@ -24,8 +24,4 @@ void OpenGLWrapper::resetCurrent()
     [NSOpenGLContext clearCurrentContext];
 }
 
-void OpenGLWrapper::init(NSOpenGLView* pView)
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f0226bfa04321e6fcdc4646e7e0c859a7cb22ee1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Sep 1 22:14:07 2014 +0200

    fix non Mac build
    
    Change-Id: I88df76fc1757b8372cd319ae1ecd7976b01554a1

diff --git a/vcl/Library_vclopengl.mk b/vcl/Library_vclopengl.mk
index e5fbbfe..e61dd8a 100644
--- a/vcl/Library_vclopengl.mk
+++ b/vcl/Library_vclopengl.mk
@@ -38,6 +38,12 @@ $(eval $(call gb_Library_use_libraries,vclopengl,\
     $(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_add_exception_objects,vclopengl,\
+    vcl/source/opengl/OpenGLContext \
+    vcl/source/opengl/OpenGLHelper \
+    vcl/source/window/openglwin \
+))
+
 ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_Library_add_cxxflags,vclopengl,\
@@ -53,9 +59,6 @@ $(eval $(call gb_Library_add_libs,vcl,\
 
 $(eval $(call gb_Library_add_exception_objects,vclopengl,\
     vcl/osx/OpenGLWrapper \
-    vcl/source/opengl/OpenGLContext \
-    vcl/source/opengl/OpenGLHelper \
-    vcl/source/window/openglwin \
 ))
 
 endif