forked from enlightenment/efl
evas: fix build without FontConfig.
Note that we still support building without FontConfig, so please guard access to it.
This commit is contained in:
parent
753c359e61
commit
239c326b96
|
@ -1220,8 +1220,10 @@ _canvas_font_path_clear(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list EINA_UNUS
|
||||||
evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data);
|
evas->font_path = eina_list_remove(evas->font_path, evas->font_path->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_FONTCONFIG
|
||||||
if (fc_config)
|
if (fc_config)
|
||||||
FcConfigAppFontClear(fc_config);
|
FcConfigAppFontClear(fc_config);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
@ -1242,8 +1244,10 @@ _canvas_font_path_append(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
|
||||||
e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path));
|
e->font_path = eina_list_append(e->font_path, eina_stringshare_add(path));
|
||||||
|
|
||||||
evas_font_init();
|
evas_font_init();
|
||||||
|
#ifdef HAVE_FONTCONFIG
|
||||||
if (fc_config)
|
if (fc_config)
|
||||||
FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
|
FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
@ -1264,8 +1268,10 @@ _canvas_font_path_prepend(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
|
||||||
e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path));
|
e->font_path = eina_list_prepend(e->font_path, eina_stringshare_add(path));
|
||||||
|
|
||||||
evas_font_init();
|
evas_font_init();
|
||||||
|
#ifdef HAVE_FONTCONFIG
|
||||||
if (fc_config)
|
if (fc_config)
|
||||||
FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
|
FcConfigAppFontAddDir(fc_config, (const FcChar8 *) path);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI const Eina_List *
|
EAPI const Eina_List *
|
||||||
|
|
Loading…
Reference in New Issue