diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:40:13 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-25 11:05:47 +0000 |
| commit | 96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch) | |
| tree | 1482b9e0b899a783f64aaed3b9728533a81eff58 /toolkit | |
| parent | Updated core (diff) | |
| download | core-96c1ae1d8e78ae8b9bd7d4001645cad24d62b720.tar.gz core-96c1ae1d8e78ae8b9bd7d4001645cad24d62b720.zip | |
fix headless build
disables OpenGL and glew usage, lets --without-gui do what
--without-x did before and disables X related test
Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb
Reviewed-on: https://gerrit.libreoffice.org/23474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/Library_tk.mk | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 1136e2e65896..ecb376eb54c2 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -23,9 +23,13 @@ $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) $(eval $(call gb_Library_use_externals,tk,\ boost_headers \ - glew \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,tk,\ + glew \ +)) +endif $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ -I$(SRCDIR)/toolkit/inc \ diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index c72c1b6216a5..45a606375984 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -22,6 +22,7 @@ #include <prewin.h> #include <postwin.h> #endif +#include <config_features.h> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/WindowClass.hpp> @@ -113,7 +114,9 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/throbber.hxx> +#if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> +#endif #include "toolkit/awt/vclxspinbutton.hxx" #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -1922,7 +1925,11 @@ void SAL_CALL VCLXToolkit::processEventsToIdle() sal_Int64 SAL_CALL VCLXToolkit::getOpenGLBufferSwapCounter() throw (css::uno::RuntimeException, std::exception) { +#if HAVE_FEATURE_OPENGL return OpenGLWrapper::getBufferSwapCounter(); +#else + return 0; +#endif } // css:awt:XToolkitRobot |