diff --git a/3party/freetype/freetype.pro b/3party/freetype/freetype.pro index 604d7316a1..28307da467 100644 --- a/3party/freetype/freetype.pro +++ b/3party/freetype/freetype.pro @@ -11,6 +11,10 @@ include($$ROOT_DIR/common.pri) CONFIG -= warn_on CONFIG *= warn_off +linux-g++* { + DEFINES += OMIM_FULL_FREETYPE +} + SOURCES += \ src/autofit/afangles.c \ src/autofit/afcjk.c \ @@ -94,3 +98,27 @@ SOURCES += \ src/truetype/truetype.c \ src/cache/ftstrokedcache.c +contains(DEFINES, OMIM_FULL_FREETYPE) { + SOURCES += \ + src/cff/cf2ft.c \ + src/cff/cf2font.c \ + src/cff/cf2blues.c \ + src/cff/cf2intrp.c \ + src/cff/cf2stack.c \ + src/cff/cf2arrst.c \ + src/cff/cf2hints.c \ + src/cff/cf2error.c \ + src/cff/cf2read.c \ + src/type1/t1afm.c \ + src/type1/t1driver.c \ + src/type1/t1gload.c \ + src/type1/t1load.c \ + src/type1/t1objs.c \ + src/type1/t1parse.c \ + src/type42/t42drivr.c \ + src/type42/t42objs.c \ + src/type42/t42parse.c \ + src/type42/type42.c \ + src/winfonts/winfnt.c \ + +} diff --git a/3party/freetype/include/freetype/config/ftmodule.h b/3party/freetype/include/freetype/config/ftmodule.h index 3b6a432143..bc2c0524a9 100644 --- a/3party/freetype/include/freetype/config/ftmodule.h +++ b/3party/freetype/include/freetype/config/ftmodule.h @@ -12,21 +12,24 @@ FT_USE_MODULE( FT_Module_Class, autofit_module_class ) FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) -//FT_USE_MODULE( FT_Module_Class, psaux_module_class ) +#ifdef OMIM_FULL_FREETYPE + FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) + FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) + FT_USE_MODULE( FT_Module_Class, psaux_module_class ) +#endif FT_USE_MODULE( FT_Module_Class, psnames_module_class ) FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) -//FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class ) -//FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) -//FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) -//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) - +#ifdef OMIM_FULL_FREETYPE + FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) + FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) + FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) + FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) +#endif /* EOF */