diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 14:41:15 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 11:58:13 +0000 |
| commit | 86d06c9102d6f59946d7fbfdee5bb40e9a6d0fc6 (patch) | |
| tree | b973fc20e91e40c8e542f8a8551cbf159273f875 | |
| parent | afab984f974d95c57b1a580387dcea2127bc3ca6 (diff) | |
vcl: move some Freetype stuff away from the "generic" folder
Freetype is definitely not "generic" code. It is only used for Unix
platforms, but is not used for OS X which has it's own font/glyph/text
system called CoreText and that is implemented elsewhere in our
codebase.
Change-Id: I30b2756d2cd9a81b6f746988685295d25ba1de44
Reviewed-on: https://gerrit.libreoffice.org/21286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
| -rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/glyphs/graphite_serverfont.cxx | 2 | ||||
| -rw-r--r-- | vcl/inc/unx/gcach_ftyp.hxx (renamed from vcl/generic/glyphs/gcach_ftyp.hxx) | 0 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/gcach_ftyp.cxx (renamed from vcl/generic/glyphs/gcach_ftyp.cxx) | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f7a1a65796e8..dad511bd5e8d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -555,7 +555,6 @@ vcl_generic_code= \ vcl/generic/print/prtsetup \ vcl/generic/print/text_gfx \ vcl/generic/fontmanager/fontsubst \ - vcl/generic/glyphs/gcach_ftyp \ vcl/generic/glyphs/gcach_layout \ vcl/generic/glyphs/glyphcache \ vcl/generic/glyphs/scrptrun \ @@ -588,6 +587,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/unx/generic/gdi/x11windowprovider \ + vcl/unx/generic/gdi/gcach_ftyp \ vcl/unx/generic/window/screensaverinhibitor \ $(if $(filter TRUE,$(ENABLE_CUPS)),\ vcl/unx/generic/printer/cupsmgr \ diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 8fa3a5f62eb3..9aa21bfb4f7b 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <gcach_ftyp.hxx> +#include "unx/gcach_ftyp.hxx" #include <sallayout.hxx> #include <salgdi.hxx> #include <scrptrun.h> diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index bfac3283af2f..12788c0c2011 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -19,7 +19,7 @@ #include <stdlib.h> #include <math.h> -#include <gcach_ftyp.hxx> +#include "unx/gcach_ftyp.hxx" #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 763846971715..63b0fa724147 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -23,7 +23,7 @@ #include <i18nlangtag/languagetag.hxx> #include <sallayout.hxx> // Module -#include "gcach_ftyp.hxx" +#include "unx/gcach_ftyp.hxx" #include "generic/glyphcache.hxx" #include <graphite_features.hxx> #include <graphite_serverfont.hxx> diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/inc/unx/gcach_ftyp.hxx index 084ea03a01ab..084ea03a01ab 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/inc/unx/gcach_ftyp.hxx diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/unx/generic/gdi/gcach_ftyp.cxx index 88793e20867e..0bda2eff4d2f 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/unx/generic/gdi/gcach_ftyp.cxx @@ -20,7 +20,7 @@ #include <vcl/fontcharmap.hxx> -#include "gcach_ftyp.hxx" +#include "unx/gcach_ftyp.hxx" #include "vcl/svapp.hxx" #include <fontinstance.hxx> |