diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2014-12-22 19:10:59 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-07 00:01:41 +0000 |
| commit | b9a847b78ceaa3b5840429dab1bc50d35c7ef3de (patch) | |
| tree | 1bcd505077a08a8f24362e35362a0fad54bc9684 /vcl/Module_vcl.mk | |
| parent | fdo#43368 Remove MapiLogon/Logoff calls so simplemail works with WLM (diff) | |
| download | core-b9a847b78ceaa3b5840429dab1bc50d35c7ef3de.tar.gz core-b9a847b78ceaa3b5840429dab1bc50d35c7ef3de.zip | |
Fixup --without-x build
Accept gl linkage in hope of future offscreen mesa support.
Avoid linking with GLX though.
Change-Id: I4e666f60e74fe34075a8da9eeba95807cf8fe38c
Signed-off-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/13452
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/Module_vcl.mk')
| -rw-r--r-- | vcl/Module_vcl.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 9cc9ee038d87..a0ed040cdbe5 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,12 +25,14 @@ $(eval $(call gb_Module_add_targets,vcl,\ Package_opengl \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ - Executable_ui-previewer \ + $(if $(ENABLE_HEADLESS),, \ + Executable_ui-previewer) \ $(if $(filter LINUX MACOSX WNT,$(OS)), \ - Executable_icontest \ Executable_outdevgrind \ - Executable_vcldemo \ - Executable_mtfdemo )) \ + $(if $(ENABLE_HEADLESS),, \ + Executable_vcldemo \ + Executable_icontest \ + Executable_mtfdemo ))) \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \ Executable_svdemo \ Executable_svptest \ @@ -48,7 +50,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gen \ Library_desktop_detector \ StaticLibrary_headless \ - StaticLibrary_glxtest \ + StaticLibrary_glxtest \ Package_fontunxppds \ Package_fontunxpsprint \ )) @@ -107,10 +109,16 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_wmf_test \ )) + ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_timer \ )) endif +ifeq ($(ENABLE_HEADLESS),TRUE) +$(eval $(call gb_Module_add_check_targets,vcl,\ + CppunitTest_vcl_timer \ +)) +endif # vim: set noet sw=4 ts=4: |