diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-06 10:25:42 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-07 15:14:28 +0200 |
| commit | bf06908b674251ea71875aa664a0f4a98d6781ab (patch) | |
| tree | 7bcbc9034b3b1ad15ca3aeb9c51367ab1deb59f8 /vcl | |
| parent | a714cf18b1c6cadae93df92376a11aeb98b65418 (diff) | |
further reduce GUIBASE usage; don't set it to headless
Change-Id: I76916c15f380bd80e823845f52f32a1c444079da
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 46532a2d58d2..8daa5bb87333 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -27,7 +27,7 @@ else ifeq ($(OS),ANDROID) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android)) else ifeq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios)) -else ifeq ($(GUIBASE),headless) +else ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless)) else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) @@ -324,12 +324,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ )) # handle X11 platforms, which have additional files and possibly system graphite -ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/generic/glyphs/graphite_serverfont \ -)) -endif -ifeq ($(GUIBASE),headless) +ifneq (,$(or $(filter unx,$(GUIBASE)),$(ENABLE_HEADLESS))) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) @@ -538,7 +533,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif -ifeq ($(GUIBASE),headless) +ifeq ($(ENABLE_HEADLESS),TRUE) $(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ |