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 /chart2/Library_chartcore.mk | |
| parent | 44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff) | |
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 'chart2/Library_chartcore.mk')
| -rw-r--r-- | chart2/Library_chartcore.mk | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index ce2043a415d3..99d3c3328776 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -28,9 +28,14 @@ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/p $(eval $(call gb_Library_use_externals,chartcore,\ boost_headers \ glm_headers \ - glew \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_use_externals,chartcore,\ + glew \ +)) +endif + $(eval $(call gb_Library_use_custom_headers,chartcore,\ officecfg/registry \ )) @@ -82,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/axes/VPolarCoordinateSystem \ chart2/source/view/axes/VPolarGrid \ chart2/source/view/axes/VPolarRadiusAxis \ - chart2/source/view/charttypes/GL3DBarChart \ chart2/source/view/charttypes/AreaChart \ chart2/source/view/charttypes/BarChart \ chart2/source/view/charttypes/BarPositionHelper \ @@ -94,14 +98,11 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/charttypes/Splines \ chart2/source/view/charttypes/VSeriesPlotter \ chart2/source/view/diagram/VDiagram \ - chart2/source/view/main/3DChartObjects \ chart2/source/view/main/ChartItemPool \ chart2/source/view/main/ChartView \ chart2/source/view/main/Clipping \ chart2/source/view/main/DataPointSymbolSupplier \ chart2/source/view/main/DrawModelWrapper \ - chart2/source/view/main/GL3DPlotterBase \ - chart2/source/view/main/GL3DRenderer \ chart2/source/view/main/LabelPositionHelper \ chart2/source/view/main/Linear3DTransformation \ chart2/source/view/main/PlotterBase \ @@ -118,6 +119,14 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/view/main/VPolarTransformation \ chart2/source/view/main/VTitle \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_add_exception_objects,chartcore,\ + chart2/source/view/main/3DChartObjects \ + chart2/source/view/main/GL3DPlotterBase \ + chart2/source/view/main/GL3DRenderer \ + chart2/source/view/charttypes/GL3DBarChart \ +)) +endif # model pieces ... $(eval $(call gb_Library_add_exception_objects,chartcore,\ @@ -256,9 +265,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\ else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,chartcore,\ $(DLOPEN_LIBS) \ - -lGL \ - -lX11 \ )) +ifeq ($(ENABLE_OPENGL),TRUE) +$(eval $(call gb_Library_add_libs,chartcore,\ + -lGL \ + -lX11 \ +)) +endif #ENABLE_OPENGL + endif # vim: set noet sw=4 ts=4: |