diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-13 15:54:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-23 14:25:58 +0000 |
| commit | b0f5416d7ee7c988d316df7ffa0318fa6514e4de (patch) | |
| tree | c196c9966ee53499559806050bb2f01195d91c23 /vcl/Library_vcl.mk | |
| parent | e34f290eec4f3c8d42724f1602029f5680aecde6 (diff) | |
Do all svp text rendering with cairo
enabling us to delete a whole pile of foo
For android we patch cairo, which is internal in that case, to swap the rgb
components so that cairo then matches the OpenGL GL_RGBA format so we can use
it there where we don't have GL_BGRA support.
Change-Id: I25e34889c7b7263438b143dd2a2ad882fb0f190a
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e9db8fea26b7..25f2d855c46f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -556,7 +556,6 @@ vcl_generic_code= \ vcl/generic/fontmanager/fontsubst \ vcl/generic/glyphs/gcach_ftyp \ vcl/generic/glyphs/gcach_layout \ - vcl/generic/glyphs/gcach_rbmp \ vcl/generic/glyphs/glyphcache \ vcl/generic/glyphs/scrptrun \ vcl/generic/fontmanager/fontcache \ @@ -577,7 +576,9 @@ vcl_headless_code= \ vcl_headless_freetype_code=\ vcl/headless/svpprn \ vcl/headless/svptext \ - vcl/headless/svptextrender \ + vcl/headless/svpglyphcache \ + vcl/unx/generic/gdi/cairotextrender \ + vcl/headless/svpcairotextrender \ ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ @@ -585,7 +586,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/plugadapt/salplug \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ - vcl/unx/generic/gdi/cairotextrender \ vcl/unx/generic/gdi/x11windowprovider \ vcl/unx/generic/window/screensaverinhibitor \ $(if $(filter TRUE,$(ENABLE_CUPS)),\ |