[Libreoffice-commits] core.git: vcl/Library_vcl.mk

[Caolán McNamara]

 vcl/Library_vcl.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35fefeaba8faf6c83833b91cb605de576af9e457
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 9 17:15:50 2016 +0000

    try and fix android build
    
    post...
    
    commit 86d06c9102d6f59946d7fbfdee5bb40e9a6d0fc6
    Author: Chris Sherlock <chris.sherlock79 at gmail.com>
    Date:   Sat Jan 9 14:41:15 2016 +1100
    
        vcl: move some Freetype stuff away from the "generic" folder
    
    I'm not adverse to simply moving these files into the "headless"
    dir to further untangle this
    
    Change-Id: Ib0c697b3d829baa92195d29983d39406bb72fce8

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index dad511b..393d00a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -578,6 +578,7 @@ vcl_headless_freetype_code=\
     vcl/headless/svptext \
     vcl/headless/svpglyphcache \
     vcl/unx/generic/gdi/cairotextrender \
+    vcl/unx/generic/gdi/gcach_ftyp \
     vcl/headless/svpcairotextrender \
 
 ifeq ($(USING_X11),TRUE)
@@ -587,7 +588,6 @@ $(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 \