diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-11 13:41:05 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-11 03:30:42 +0000 |
| commit | 09a1566bf18cdf98b111d4979e4f4ad52ce65b07 (patch) | |
| tree | 8ae3d9283dacd2c94214f3aeda853b73f403f511 /vcl/Library_vcl.mk | |
| parent | 557a6d20080e6f4d95db9e5b4dff87f3e51ac054 (diff) | |
vcl: move all glyph files from generic to unx
All the files in glyph are only used by Unix based systems, with the
exception of OS X. Therefore, it's not really "generic" as in "used
across all platforms" but is generic as in "used in all Unix-based
systems".
Change-Id: Id89c09df74f0ddafee5c88c55bac4c35f9b23ef8
Reviewed-on: https://gerrit.libreoffice.org/21312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b3dfd097de0d..94ee4c35e964 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -423,7 +423,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # handle X11 platforms, which have additional files and possibly system graphite ifneq (,$(or $(USING_X11),$(ENABLE_HEADLESS))) $(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/generic/glyphs/graphite_serverfont \ + vcl/unx/generic/glyphs/graphite_serverfont \ )) endif @@ -555,9 +555,6 @@ vcl_generic_code= \ vcl/generic/print/prtsetup \ vcl/generic/print/text_gfx \ vcl/generic/fontmanager/fontsubst \ - vcl/generic/glyphs/gcach_layout \ - vcl/generic/glyphs/glyphcache \ - vcl/generic/glyphs/scrptrun \ vcl/generic/fontmanager/fontcache \ vcl/generic/fontmanager/fontconfig \ vcl/generic/fontmanager/fontmanager \ @@ -579,6 +576,9 @@ vcl_headless_freetype_code=\ vcl/headless/svpglyphcache \ vcl/unx/generic/gdi/cairotextrender \ vcl/unx/generic/glyphs/freetype_glyphcache \ + vcl/unx/generic/glyphs/gcach_layout \ + vcl/unx/generic/glyphs/glyphcache \ + vcl/unx/generic/glyphs/scrptrun \ vcl/headless/svpcairotextrender \ ifeq ($(USING_X11),TRUE) |