diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /canvas | |
| parent | 178e38dd82a2cffb2db747c7be82ba7a48338968 (diff) | |
change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already
Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_oglcanvas.mk | 7 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_buffercontext.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvashelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_canvastools.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_texturecache.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/opengl/ogl_tools.hxx | 3 |
7 files changed, 7 insertions, 13 deletions
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk index 0118eb118db1..9d1042dda8d2 100644 --- a/canvas/Library_oglcanvas.mk +++ b/canvas/Library_oglcanvas.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\ $(eval $(call gb_Library_use_externals,oglcanvas,\ boost_headers \ - glew \ + epoxy \ )) ifeq ($(strip $(OS)),MACOSX) @@ -58,11 +58,6 @@ $(eval $(call gb_Library_use_system_win32_libs,oglcanvas,\ opengl32 \ )) -else -$(eval $(call gb_Library_add_libs,oglcanvas,\ - -lGL \ - -lX11 \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index 202e0634dbad..7f2066a0e075 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX -#include <GL/glew.h> +#include <epoxy/gl.h> #include <sal/config.h> #include <memory> diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 8d38177be946..6b23d4504740 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -9,7 +9,7 @@ #include <sal/config.h> -#include <GL/glew.h> +#include <epoxy/gl.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx index 84a96cedf86a..175a02bc4df0 100644 --- a/canvas/source/opengl/ogl_canvashelper.cxx +++ b/canvas/source/opengl/ogl_canvashelper.cxx @@ -11,7 +11,7 @@ #include <memory> #include <functional> -#include <GL/glew.h> +#include <epoxy/gl.h> #include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/canvas/source/opengl/ogl_canvastools.cxx b/canvas/source/opengl/ogl_canvastools.cxx index 657a22027ba7..3d9448b367bf 100644 --- a/canvas/source/opengl/ogl_canvastools.cxx +++ b/canvas/source/opengl/ogl_canvastools.cxx @@ -9,7 +9,7 @@ #include <sal/config.h> -#include <GL/glew.h> +#include <epoxy/gl.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygontriangulator.hxx> diff --git a/canvas/source/opengl/ogl_texturecache.cxx b/canvas/source/opengl/ogl_texturecache.cxx index 08cdd2f3b0a2..43fb7d8e2e25 100644 --- a/canvas/source/opengl/ogl_texturecache.cxx +++ b/canvas/source/opengl/ogl_texturecache.cxx @@ -9,7 +9,7 @@ #include <sal/config.h> -#include <GL/glew.h> +#include <epoxy/gl.h> #include <com/sun/star/geometry/IntegerSize2D.hpp> diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx index 8133212e8e81..469a5be7874b 100644 --- a/canvas/source/opengl/ogl_tools.hxx +++ b/canvas/source/opengl/ogl_tools.hxx @@ -11,8 +11,7 @@ #define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX #include <sal/config.h> -#include <GL/glew.h> - +#include <epoxy/gl.h> namespace oglcanvas { |