vcl/Library_vcl.mk | 2 vcl/generic/glyphs/gcach_ftyp.cxx | 1547 ----------------------------- vcl/generic/glyphs/gcach_ftyp.hxx | 164 --- vcl/generic/glyphs/gcach_layout.cxx | 2 vcl/generic/glyphs/glyphcache.cxx | 2 vcl/generic/glyphs/graphite_serverfont.cxx | 2 vcl/inc/unx/gcach_ftyp.hxx | 164 +++ vcl/unx/generic/gdi/gcach_ftyp.cxx | 1547 +++++++++++++++++++++++++++++ 8 files changed, 1715 insertions(+), 1715 deletions(-)
New commits: commit 86d06c9102d6f59946d7fbfdee5bb40e9a6d0fc6 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Sat Jan 9 14:41:15 2016 +1100 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 <c...@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f7a1a65..dad511b 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 8fa3a5f..9aa21bf 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 bfac328..12788c0 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 7638469..63b0fa7 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 similarity index 100% rename from vcl/generic/glyphs/gcach_ftyp.hxx rename to vcl/inc/unx/gcach_ftyp.hxx diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/unx/generic/gdi/gcach_ftyp.cxx similarity index 99% rename from vcl/generic/glyphs/gcach_ftyp.cxx rename to vcl/unx/generic/gdi/gcach_ftyp.cxx index 88793e2..0bda2ef 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> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits