[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - RepositoryExternal.mk
Michael Stahl
mstahl at redhat.com
Wed Sep 28 15:38:12 UTC 2016
RepositoryExternal.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit de299945d0b2ef24c4557db670dc7d78301f1ba7
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Sep 27 21:27:03 2016 +0200
RepositoryExternal: enable glew also for ENABLE_OPENGL_CANVAS
The OpenGL variables were refactored quite a bit on master, but this
just fixes the --enable-mpl-subset build that was reported as broken
on the list.
Change-Id: Ida91a7654e905542b9e129c5d56a312ea2fa65c6
Reviewed-on: https://gerrit.libreoffice.org/29328
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 135cd7f..0fc7d25 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -183,7 +183,7 @@ endef
endif # SYSTEM_CPPUNIT
-ifneq ($(ENABLE_OPENGL)$(if $(filter ANDROID,$(OS)),TRUE),)
+ifneq ($(ENABLE_OPENGL)$(ENABLE_OPENGL_CANVAS)$(if $(filter ANDROID,$(OS)),TRUE),)
ifneq ($(SYSTEM_GLEW),)
define gb_LinkTarget__use_glew
More information about the Libreoffice-commits
mailing list