[Libreoffice-commits] core.git: 2 commits - Repository.mk vcl/source

[Markus Mohrhard]

 Repository.mk                      |    6 +++---
 vcl/source/opengl/OpenGLHelper.cxx |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 4cbd2c0b414ca229d7a30c77ce06c01be718147f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Nov 12 06:02:48 2014 +0100

    add quick way to enable OpenGL backend through env var
    
    Change-Id: I274c76178500c231c1339ac5f0cb7fc084cd1e4b

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index d9f445d..1fadd50 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -373,7 +373,9 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
 {
     if (!supportsVCLOpenGL())
         return false;
-    bool bEnable = officecfg::Office::Common::VCL::UseOpenGL::get();
+
+    static bool bEnableGLEnv = !!getenv("SAL_ENABLEGL");
+    bool bEnable = bEnableGLEnv || officecfg::Office::Common::VCL::UseOpenGL::get();
     return bEnable;
 }
 
commit 80c83f4a578e1ec0c8b5e439687716e365937c9a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Nov 12 05:59:39 2014 +0100

    Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go to instdir""
    
    This reverts commit b64caa8ad85d951c74e1c84096802997340c8e1b.

diff --git a/Repository.mk b/Repository.mk
index 3d3e35a..e62f632 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -68,9 +68,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
         svpclient \
         pixelctl ) \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
-	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
-	    outdevgrind) \
-	vcldemo \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
 ))
@@ -150,6 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	$(if $(filter WNT,$(OS)), \
 		senddoc \
 	) \
+	$(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
+	    outdevgrind) \
+	vcldemo \
 ))
 
 ifeq ($(OS),WNT)