[config] Don't compile disabled features

This makes it possible to include all .cc files into build, even if not
building CoreText, Uniscribe, etc.

This was mostly to help custom builders.  But also means that we can
include all files in our own build system.  Not sure if we should.
Definitely simplifies things, but slightly only.
This commit is contained in:
Behdad Esfahbod 2019-06-17 22:41:49 -07:00
parent 33d8b76e74
commit aa3450cac1
10 changed files with 51 additions and 0 deletions

View File

@ -424,6 +424,7 @@ HarfBuzz_0_0_gir_CFLAGS = \
-DHB_AAT_H_IN \ -DHB_AAT_H_IN \
-DHB_GOBJECT_H \ -DHB_GOBJECT_H \
-DHB_GOBJECT_H_IN \ -DHB_GOBJECT_H_IN \
-DHAVE_GOBJECT \
-DHB_EXTERN= \ -DHB_EXTERN= \
$(NULL) $(NULL)
HarfBuzz_0_0_gir_LIBS = \ HarfBuzz_0_0_gir_LIBS = \

View File

@ -27,6 +27,9 @@
*/ */
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_CORETEXT
#include "hb-shaper-impl.hh" #include "hb-shaper-impl.hh"
#include "hb-coretext.h" #include "hb-coretext.h"
@ -1148,3 +1151,6 @@ fail:
return ret; return ret;
} }
#endif

View File

@ -23,6 +23,9 @@
*/ */
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_DIRECTWRITE
#include "hb-shaper-impl.hh" #include "hb-shaper-impl.hh"
#include <DWrite_1.h> #include <DWrite_1.h>
@ -958,3 +961,6 @@ hb_directwrite_face_get_font_face (hb_face_t *face)
{ {
return face->data.directwrite->fontFace; return face->data.directwrite->fontFace;
} }
#endif

View File

@ -29,6 +29,8 @@
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_FREETYPE
#include "hb-ft.h" #include "hb-ft.h"
#include "hb-font.hh" #include "hb-font.hh"
@ -877,3 +879,6 @@ hb_ft_font_set_funcs (hb_font_t *font)
_hb_ft_font_set_funcs (font, ft_face, true); _hb_ft_font_set_funcs (font, ft_face, true);
hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
} }
#endif

View File

@ -28,6 +28,8 @@
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_GLIB
#include "hb-glib.h" #include "hb-glib.h"
#include "hb-machinery.hh" #include "hb-machinery.hh"
@ -404,3 +406,6 @@ hb_glib_blob_create (GBytes *gbytes)
_hb_g_bytes_unref); _hb_g_bytes_unref);
} }
#endif #endif
#endif

View File

@ -27,6 +27,8 @@
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_GOBJECT
/* g++ didn't like older gtype.h gcc-only code path. */ /* g++ didn't like older gtype.h gcc-only code path. */
#include <glib.h> #include <glib.h>
#if !GLIB_CHECK_VERSION(2,29,16) #if !GLIB_CHECK_VERSION(2,29,16)
@ -44,6 +46,11 @@
/* enumerations from "@filename@" */ /* enumerations from "@filename@" */
/*** END file-production ***/ /*** END file-production ***/
/*** BEGIN file-tail ***/
#endif
/*** END file-tail ***/
/*** BEGIN value-header ***/ /*** BEGIN value-header ***/
GType GType
@enum_name@_get_type () @enum_name@_get_type ()

View File

@ -26,6 +26,8 @@
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_GOBJECT
/** /**
* SECTION:hb-gobject * SECTION:hb-gobject
@ -94,3 +96,6 @@ HB_DEFINE_VALUE_TYPE (user_data_key)
HB_DEFINE_VALUE_TYPE (ot_math_glyph_variant) HB_DEFINE_VALUE_TYPE (ot_math_glyph_variant)
HB_DEFINE_VALUE_TYPE (ot_math_glyph_part) HB_DEFINE_VALUE_TYPE (ot_math_glyph_part)
#endif

View File

@ -26,6 +26,10 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb.hh"
#ifdef HAVE_GRAPHITE2
#include "hb-shaper-impl.hh" #include "hb-shaper-impl.hh"
#include "hb-graphite2.h" #include "hb-graphite2.h"
@ -447,3 +451,6 @@ _hb_graphite2_shape (hb_shape_plan_t *shape_plan HB_UNUSED,
return true; return true;
} }
#endif

View File

@ -29,6 +29,8 @@
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_ICU
#include "hb-icu.h" #include "hb-icu.h"
#include "hb-machinery.hh" #include "hb-machinery.hh"
@ -351,3 +353,6 @@ hb_icu_get_unicode_funcs ()
{ {
return static_icu_funcs.get_unconst (); return static_icu_funcs.get_unconst ();
} }
#endif

View File

@ -25,6 +25,9 @@
*/ */
#include "hb.hh" #include "hb.hh"
#ifdef HAVE_UNISCRIBE
#include "hb-shaper-impl.hh" #include "hb-shaper-impl.hh"
#include <windows.h> #include <windows.h>
@ -1023,3 +1026,4 @@ retry:
} }
#endif