diff options
author | Oliver Specht <oliver.specht@cib.de> | 2016-02-17 15:10:53 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-02-20 01:38:17 +0100 |
commit | 5fbcf54de2a35b02a4890c0748d4d3accae75835 (patch) | |
tree | 80f84101f6b73a8a2442ca811ee94bad662b61b0 | |
parent | 1e75c5c48b2cdf3b6d5ba7eacef44b72ee64c5bd (diff) |
OpenGL remainders disabled in headless build
Change-Id: I542cd396c7a03d35aa2ceddc1ff3615f307b64ac
-rw-r--r-- | Repository.mk | 8 | ||||
-rw-r--r-- | avmedia/Library_avmediaogl.mk | 3 | ||||
-rw-r--r-- | cui/source/dialogs/about.cxx | 5 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 8 | ||||
-rw-r--r-- | postprocess/Rdb_services.mk | 2 |
5 files changed, 21 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index f7c89c0057a0..13747dfd72ce 100644 --- a/Repository.mk +++ b/Repository.mk @@ -568,7 +568,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \ $(if $(ENABLE_DIRECTX),avmediawin) \ - $(if $(ENABLE_GLTF),avmediaogl) \ cached1 \ collator_data \ comphelper \ @@ -629,6 +628,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ ) \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +ifeq ($(ENABLE_GLTF),TRUE) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,avmediaogl, \ + avmediaogl \ +)) +endif +endif ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 3ff981811846..d72b2ea7c030 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -7,6 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +ifeq ($(ENABLE_OPENGL),TRUE) $(eval $(call gb_Library_Library,avmediaogl)) $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl)) @@ -57,5 +58,5 @@ $(eval $(call gb_Library_add_libs,avmediaogl,\ -lGL \ )) endif - +endif # vim: set noet sw=4 ts=4: diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 4121887933ff..ea6caf8ae7b0 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -49,6 +49,7 @@ #include <vcl/bitmap.hxx> #include <officecfg/Office/Common.hxx> #include <vcl/opengl/OpenGLWrapper.hxx> +#include <config_features.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -296,12 +297,12 @@ OUString AboutDialog::GetVersionString() } sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } - +#if HAVE_FEATURE_OPENGL if (OpenGLWrapper::isVCLOpenGLEnabled()) { sVersion += "-GL"; } - +#endif if (EXTRA_BUILDID[0] != '\0') { sVersion += "\n" EXTRA_BUILDID; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index f2761e52005a..aae6f629760b 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <svl/zforlist.hxx> #include <svl/currencytable.hxx> #include <svtools/grfmgr.hxx> @@ -90,7 +91,9 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/IconThemeInfo.hxx> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> +#endif #include "optgdlg.hxx" #include <svx/ofaitem.hxx> @@ -549,10 +552,13 @@ CanvasSettings::CanvasSettings() : bool CanvasSettings::IsHardwareAccelerationAvailable() const { +#if HAVE_FEATURE_OPENGL if( OpenGLWrapper::isVCLOpenGLEnabled() ) mbHWAccelAvailable = false; - else if( !mbHWAccelChecked ) + else +#endif + if( !mbHWAccelChecked ) { mbHWAccelChecked = true; diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 153055f43dfb..b6a49dd99fce 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -238,9 +238,11 @@ $(eval $(call gb_Rdb_add_components,services,\ wizards/com/sun/star/wizards/report/report \ wizards/com/sun/star/wizards/table/table \ ) \ + $(if $(ENABLE_OPENGL), \ $(if $(ENABLE_GLTF), \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \ ) \ + ) \ )) ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) |