Kaydet (Commit) 86d06c91 authored tarafından Chris Sherlock's avatar Chris Sherlock

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/21286Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
üst afab984f
......@@ -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 \
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -20,7 +20,7 @@
#include <vcl/fontcharmap.hxx>
#include "gcach_ftyp.hxx"
#include "unx/gcach_ftyp.hxx"
#include "vcl/svapp.hxx"
#include <fontinstance.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment