diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 5 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 1 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 1 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 1 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 1 | ||||
| -rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/win/salgdi.h | 1 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 1 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 1 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 1 |
12 files changed, 13 insertions, 4 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 3550beb6c9bb..64808890c37c 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -293,10 +293,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ## handle Graphite ifeq ($(ENABLE_GRAPHITE),TRUE) -# add defines, graphite sources for all platforms -$(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_GRAPHITE \ -)) +# add graphite sources for all platforms $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/glyphs/graphite_features \ vcl/source/glyphs/graphite_layout \ diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 31aec5599511..fa256aa96f46 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -28,6 +28,7 @@ #include "vcl/svapp.hxx" #include <outfont.hxx> #include <impfont.hxx> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite2/Font.h> #include <graphite_layout.hxx> diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index edd35320e7bd..9d677e1cf252 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -24,6 +24,7 @@ #include <rtl/textcvt.h> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE class GraphiteFaceWrapper; #endif diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index bc3c544ad896..deef6be55659 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -27,6 +27,7 @@ #include <vcl/bitmap.hxx> #include <outfont.hxx> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite_features.hxx> #endif diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 3365fbb569e0..27db385ebf09 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -46,6 +46,7 @@ #include "region.h" #include "langboost.hxx" +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite_layout.hxx> #include <graphite_serverfont.hxx> diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 655f2cdfbfa9..9de49e7543fd 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -48,6 +48,7 @@ class RawBitmap; class ServerFontLayout; #include <sallayout.hxx> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE class GraphiteFaceWrapper; #endif diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 7a2b804b6cb3..92c0b8e0db43 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -29,6 +29,7 @@ #include "boost/scoped_ptr.hpp" #include <boost/unordered_set.hpp> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite2/Font.h> #endif diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index acd50e21d762..c76945868f50 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -63,6 +63,7 @@ #include "osl/file.h" +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include "graphite_features.hxx" #endif diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 116c6a9d132c..48f295b5931b 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -49,6 +49,8 @@ #include <queue> #include <set> +#include <config_graphite.h> + // -=-= SalPolyLine =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #define STATIC_POINTS 64 diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index beaf8fd9d68b..fb7027eab594 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -66,6 +66,7 @@ #include "salframe.hxx" #include "outdev.h" +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite_layout.hxx> #include <graphite_serverfont.hxx> diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 597df76eb59c..da4f4e071564 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -64,6 +64,7 @@ #include <algorithm> +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <graphite2/Font.h> #endif diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 03e59a0b80e3..fcc5fdcd2578 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -50,6 +50,7 @@ typedef boost::unordered_map<int,int> IntMap; // Graphite headers +#include <config_graphite.h> #ifdef ENABLE_GRAPHITE #include <i18npool/languagetag.hxx> #include <graphite_layout.hxx> |