diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-18 14:12:08 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-25 07:25:46 +0000 |
| commit | c29ea22b899f24dab3eecce9df8c70544f044e1b (patch) | |
| tree | 83c000b95f9863a938facc96b75d7e65e7e2b127 /vcl | |
| parent | edb9ef41f29bf3477b8985ee409ce2d22214e63f (diff) | |
Replace GUIBASE with USING_X11
That's what it actually means. Also make it a boolean
Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c
Reviewed-on: https://gerrit.libreoffice.org/18688
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b5c04998bab0..6ec09591b0a2 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -406,7 +406,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ )) # handle X11 platforms, which have additional files and possibly system graphite -ifneq (,$(or $(filter unx,$(GUIBASE)),$(ENABLE_HEADLESS))) +ifneq (,$(or $(USING_X11),$(ENABLE_HEADLESS))) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) @@ -428,8 +428,6 @@ vcl_coretext_code= \ vcl/quartz/ctlayout \ vcl/quartz/salgdi \ -# GUIBASE specific stuff - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_cxxflags,vcl,\ @@ -567,7 +565,7 @@ vcl_headless_freetype_code=\ vcl/headless/svptext \ vcl/headless/svptextrender \ -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ $(vcl_generic_code) \ vcl/unx/generic/plugadapt/salplug \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 1d54172c3d72..607d13edf74d 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Module_add_l10n_targets,vcl,\ UIConfig_vcl \ )) -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gen \ Library_desktop_detector \ @@ -105,7 +105,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_timer \ )) |