[Libreoffice-commits] core.git: include/vcl vcl/Library_vcl.mk

[Tor Lillqvist]

 include/vcl/opengl/OpenGLContext.hxx |    4 ----
 vcl/Library_vcl.mk                   |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 981c217b125baf154897233020510fe608a07eda
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Nov 11 21:16:15 2015 +0200

    It seems we don't need to include OpenGL (Mesa) headers for X11
    
    GLEW handles all that, that is why we use GLEW, isn't it?
    
    Change-Id: I83d272f89f7e6dbb0c6c4502cc1ec4d697a6b0a2

diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 695a433..cc83d34 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -45,10 +45,6 @@ class NSOpenGLView;
 #elif defined( ANDROID )
 #elif defined( LIBO_HEADLESS )
 #elif defined( UNX )
-#include <GL/glext.h>
-#define GLX_GLXEXT_PROTOTYPES 1
-#include <GL/glx.h>
-#include <GL/glxext.h>
 #endif
 
 #include <vcl/dllapi.h>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a59c49b..3d9c693 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
 	icuuc \
 	lcms2 \
 	mdds_headers \
-	mesa_headers \
+	$(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\