From a1a651fc33d829958841643f71483246624b8131 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 16 Dec 2020 10:57:37 +0200 Subject: [PATCH] move freetype header files to match installation rule --- .../freetype/config/ftconfig.h | 7 +++-- .../freetype/config/ftheader.h | 0 .../freetype/config/ftmodule.h | 26 ++++++++++++++----- .../freetype/config/ftoption.h | 4 +-- .../freetype/config/ftstdlib.h | 0 .../freetype/config/integer-types.h | 0 .../freetype/config/mac-support.h | 0 .../freetype/config/public-macros.h | 0 .../{ => freetype2}/freetype/freetype.h | 0 .../{ => freetype2}/freetype/ftadvanc.h | 0 .../include/{ => freetype2}/freetype/ftbbox.h | 0 .../include/{ => freetype2}/freetype/ftbdf.h | 0 .../{ => freetype2}/freetype/ftbitmap.h | 0 .../{ => freetype2}/freetype/ftbzip2.h | 0 .../{ => freetype2}/freetype/ftcache.h | 0 .../{ => freetype2}/freetype/ftchapters.h | 0 .../include/{ => freetype2}/freetype/ftcid.h | 0 .../{ => freetype2}/freetype/ftcolor.h | 0 .../{ => freetype2}/freetype/ftdriver.h | 0 .../{ => freetype2}/freetype/fterrdef.h | 0 .../{ => freetype2}/freetype/fterrors.h | 0 .../{ => freetype2}/freetype/ftfntfmt.h | 0 .../include/{ => freetype2}/freetype/ftgasp.h | 0 .../{ => freetype2}/freetype/ftglyph.h | 0 .../{ => freetype2}/freetype/ftgxval.h | 0 .../include/{ => freetype2}/freetype/ftgzip.h | 0 .../{ => freetype2}/freetype/ftimage.h | 0 .../{ => freetype2}/freetype/ftincrem.h | 0 .../{ => freetype2}/freetype/ftlcdfil.h | 0 .../include/{ => freetype2}/freetype/ftlist.h | 0 .../include/{ => freetype2}/freetype/ftlzw.h | 0 .../include/{ => freetype2}/freetype/ftmac.h | 0 .../include/{ => freetype2}/freetype/ftmm.h | 0 .../{ => freetype2}/freetype/ftmodapi.h | 0 .../{ => freetype2}/freetype/ftmoderr.h | 0 .../{ => freetype2}/freetype/ftotval.h | 0 .../{ => freetype2}/freetype/ftoutln.h | 0 .../{ => freetype2}/freetype/ftparams.h | 0 .../include/{ => freetype2}/freetype/ftpfr.h | 0 .../{ => freetype2}/freetype/ftrender.h | 0 .../{ => freetype2}/freetype/ftsizes.h | 0 .../{ => freetype2}/freetype/ftsnames.h | 0 .../{ => freetype2}/freetype/ftstroke.h | 0 .../{ => freetype2}/freetype/ftsynth.h | 0 .../{ => freetype2}/freetype/ftsystem.h | 0 .../{ => freetype2}/freetype/fttrigon.h | 0 .../{ => freetype2}/freetype/fttypes.h | 0 .../{ => freetype2}/freetype/ftwinfnt.h | 0 .../{ => freetype2}/freetype/t1tables.h | 0 .../{ => freetype2}/freetype/ttnameid.h | 0 .../{ => freetype2}/freetype/tttables.h | 0 .../include/{ => freetype2}/freetype/tttags.h | 0 .../include/{ => freetype2}/ft2build.h | 0 53 files changed, 24 insertions(+), 13 deletions(-) rename deps/freetype/include/{ => freetype2}/freetype/config/ftconfig.h (92%) rename deps/freetype/include/{ => freetype2}/freetype/config/ftheader.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/config/ftmodule.h (70%) rename deps/freetype/include/{ => freetype2}/freetype/config/ftoption.h (99%) rename deps/freetype/include/{ => freetype2}/freetype/config/ftstdlib.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/config/integer-types.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/config/mac-support.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/config/public-macros.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/freetype.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftadvanc.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftbbox.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftbdf.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftbitmap.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftbzip2.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftcache.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftchapters.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftcid.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftcolor.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftdriver.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/fterrdef.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/fterrors.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftfntfmt.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftgasp.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftglyph.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftgxval.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftgzip.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftimage.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftincrem.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftlcdfil.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftlist.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftlzw.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftmac.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftmm.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftmodapi.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftmoderr.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftotval.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftoutln.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftparams.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftpfr.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftrender.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftsizes.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftsnames.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftstroke.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftsynth.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftsystem.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/fttrigon.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/fttypes.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ftwinfnt.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/t1tables.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/ttnameid.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/tttables.h (100%) rename deps/freetype/include/{ => freetype2}/freetype/tttags.h (100%) rename deps/freetype/include/{ => freetype2}/ft2build.h (100%) diff --git a/deps/freetype/include/freetype/config/ftconfig.h b/deps/freetype/include/freetype2/freetype/config/ftconfig.h similarity index 92% rename from deps/freetype/include/freetype/config/ftconfig.h rename to deps/freetype/include/freetype2/freetype/config/ftconfig.h index 51cb7963..ffd066d8 100644 --- a/deps/freetype/include/freetype/config/ftconfig.h +++ b/deps/freetype/include/freetype2/freetype/config/ftconfig.h @@ -1,4 +1,3 @@ -/* ftconfig.h. Generated from ftconfig.h.in by configure. */ /**************************************************************************** * * ftconfig.h.in @@ -43,11 +42,11 @@ #define HAVE_UNISTD_H 1 #define HAVE_FCNTL_H 1 -/* #undef FT_USE_AUTOCONF_SIZEOF_TYPES */ +#undef FT_USE_AUTOCONF_SIZEOF_TYPES #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES -#define SIZEOF_INT 4 -#define SIZEOF_LONG 8 +#undef SIZEOF_INT +#undef SIZEOF_LONG #define FT_SIZEOF_INT SIZEOF_INT #define FT_SIZEOF_LONG SIZEOF_LONG diff --git a/deps/freetype/include/freetype/config/ftheader.h b/deps/freetype/include/freetype2/freetype/config/ftheader.h similarity index 100% rename from deps/freetype/include/freetype/config/ftheader.h rename to deps/freetype/include/freetype2/freetype/config/ftheader.h diff --git a/deps/freetype/include/freetype/config/ftmodule.h b/deps/freetype/include/freetype2/freetype/config/ftmodule.h similarity index 70% rename from deps/freetype/include/freetype/config/ftmodule.h rename to deps/freetype/include/freetype2/freetype/config/ftmodule.h index f0f07774..b5c4b1ee 100644 --- a/deps/freetype/include/freetype/config/ftmodule.h +++ b/deps/freetype/include/freetype2/freetype/config/ftmodule.h @@ -1,4 +1,16 @@ -/* This is a generated file. */ +/* + * This file registers the FreeType modules compiled into the library. + * + * If you use GNU make, this file IS NOT USED! Instead, it is created in + * the objects directory (normally `/objs/`) based on information + * from `/modules.cfg`. + * + * Please read `docs/INSTALL.ANY` and `docs/CUSTOMIZE` how to compile + * FreeType without GNU make. + * + */ + +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 ) @@ -7,12 +19,12 @@ 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_Driver_ClassRec, bdf_driver_class ) -FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) -FT_USE_MODULE( FT_Module_Class, autofit_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_Renderer_Class, ft_smooth_renderer_class ) FT_USE_MODULE( FT_Module_Class, psaux_module_class ) 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_Driver_ClassRec, bdf_driver_class ) + /* EOF */ diff --git a/deps/freetype/include/freetype/config/ftoption.h b/deps/freetype/include/freetype2/freetype/config/ftoption.h similarity index 99% rename from deps/freetype/include/freetype/config/ftoption.h rename to deps/freetype/include/freetype2/freetype/config/ftoption.h index c716141f..93df2093 100644 --- a/deps/freetype/include/freetype/config/ftoption.h +++ b/deps/freetype/include/freetype2/freetype/config/ftoption.h @@ -287,7 +287,7 @@ FT_BEGIN_HEADER * options set by those programs have precedence, overwriting the value * here with the configured one. */ -/* #undef FT_CONFIG_OPTION_USE_HARFBUZZ */ +/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ /************************************************************************** @@ -303,7 +303,7 @@ FT_BEGIN_HEADER * options set by those programs have precedence, overwriting the value * here with the configured one. */ -/* #undef FT_CONFIG_OPTION_USE_BROTLI */ +/* #define FT_CONFIG_OPTION_USE_BROTLI */ /************************************************************************** diff --git a/deps/freetype/include/freetype/config/ftstdlib.h b/deps/freetype/include/freetype2/freetype/config/ftstdlib.h similarity index 100% rename from deps/freetype/include/freetype/config/ftstdlib.h rename to deps/freetype/include/freetype2/freetype/config/ftstdlib.h diff --git a/deps/freetype/include/freetype/config/integer-types.h b/deps/freetype/include/freetype2/freetype/config/integer-types.h similarity index 100% rename from deps/freetype/include/freetype/config/integer-types.h rename to deps/freetype/include/freetype2/freetype/config/integer-types.h diff --git a/deps/freetype/include/freetype/config/mac-support.h b/deps/freetype/include/freetype2/freetype/config/mac-support.h similarity index 100% rename from deps/freetype/include/freetype/config/mac-support.h rename to deps/freetype/include/freetype2/freetype/config/mac-support.h diff --git a/deps/freetype/include/freetype/config/public-macros.h b/deps/freetype/include/freetype2/freetype/config/public-macros.h similarity index 100% rename from deps/freetype/include/freetype/config/public-macros.h rename to deps/freetype/include/freetype2/freetype/config/public-macros.h diff --git a/deps/freetype/include/freetype/freetype.h b/deps/freetype/include/freetype2/freetype/freetype.h similarity index 100% rename from deps/freetype/include/freetype/freetype.h rename to deps/freetype/include/freetype2/freetype/freetype.h diff --git a/deps/freetype/include/freetype/ftadvanc.h b/deps/freetype/include/freetype2/freetype/ftadvanc.h similarity index 100% rename from deps/freetype/include/freetype/ftadvanc.h rename to deps/freetype/include/freetype2/freetype/ftadvanc.h diff --git a/deps/freetype/include/freetype/ftbbox.h b/deps/freetype/include/freetype2/freetype/ftbbox.h similarity index 100% rename from deps/freetype/include/freetype/ftbbox.h rename to deps/freetype/include/freetype2/freetype/ftbbox.h diff --git a/deps/freetype/include/freetype/ftbdf.h b/deps/freetype/include/freetype2/freetype/ftbdf.h similarity index 100% rename from deps/freetype/include/freetype/ftbdf.h rename to deps/freetype/include/freetype2/freetype/ftbdf.h diff --git a/deps/freetype/include/freetype/ftbitmap.h b/deps/freetype/include/freetype2/freetype/ftbitmap.h similarity index 100% rename from deps/freetype/include/freetype/ftbitmap.h rename to deps/freetype/include/freetype2/freetype/ftbitmap.h diff --git a/deps/freetype/include/freetype/ftbzip2.h b/deps/freetype/include/freetype2/freetype/ftbzip2.h similarity index 100% rename from deps/freetype/include/freetype/ftbzip2.h rename to deps/freetype/include/freetype2/freetype/ftbzip2.h diff --git a/deps/freetype/include/freetype/ftcache.h b/deps/freetype/include/freetype2/freetype/ftcache.h similarity index 100% rename from deps/freetype/include/freetype/ftcache.h rename to deps/freetype/include/freetype2/freetype/ftcache.h diff --git a/deps/freetype/include/freetype/ftchapters.h b/deps/freetype/include/freetype2/freetype/ftchapters.h similarity index 100% rename from deps/freetype/include/freetype/ftchapters.h rename to deps/freetype/include/freetype2/freetype/ftchapters.h diff --git a/deps/freetype/include/freetype/ftcid.h b/deps/freetype/include/freetype2/freetype/ftcid.h similarity index 100% rename from deps/freetype/include/freetype/ftcid.h rename to deps/freetype/include/freetype2/freetype/ftcid.h diff --git a/deps/freetype/include/freetype/ftcolor.h b/deps/freetype/include/freetype2/freetype/ftcolor.h similarity index 100% rename from deps/freetype/include/freetype/ftcolor.h rename to deps/freetype/include/freetype2/freetype/ftcolor.h diff --git a/deps/freetype/include/freetype/ftdriver.h b/deps/freetype/include/freetype2/freetype/ftdriver.h similarity index 100% rename from deps/freetype/include/freetype/ftdriver.h rename to deps/freetype/include/freetype2/freetype/ftdriver.h diff --git a/deps/freetype/include/freetype/fterrdef.h b/deps/freetype/include/freetype2/freetype/fterrdef.h similarity index 100% rename from deps/freetype/include/freetype/fterrdef.h rename to deps/freetype/include/freetype2/freetype/fterrdef.h diff --git a/deps/freetype/include/freetype/fterrors.h b/deps/freetype/include/freetype2/freetype/fterrors.h similarity index 100% rename from deps/freetype/include/freetype/fterrors.h rename to deps/freetype/include/freetype2/freetype/fterrors.h diff --git a/deps/freetype/include/freetype/ftfntfmt.h b/deps/freetype/include/freetype2/freetype/ftfntfmt.h similarity index 100% rename from deps/freetype/include/freetype/ftfntfmt.h rename to deps/freetype/include/freetype2/freetype/ftfntfmt.h diff --git a/deps/freetype/include/freetype/ftgasp.h b/deps/freetype/include/freetype2/freetype/ftgasp.h similarity index 100% rename from deps/freetype/include/freetype/ftgasp.h rename to deps/freetype/include/freetype2/freetype/ftgasp.h diff --git a/deps/freetype/include/freetype/ftglyph.h b/deps/freetype/include/freetype2/freetype/ftglyph.h similarity index 100% rename from deps/freetype/include/freetype/ftglyph.h rename to deps/freetype/include/freetype2/freetype/ftglyph.h diff --git a/deps/freetype/include/freetype/ftgxval.h b/deps/freetype/include/freetype2/freetype/ftgxval.h similarity index 100% rename from deps/freetype/include/freetype/ftgxval.h rename to deps/freetype/include/freetype2/freetype/ftgxval.h diff --git a/deps/freetype/include/freetype/ftgzip.h b/deps/freetype/include/freetype2/freetype/ftgzip.h similarity index 100% rename from deps/freetype/include/freetype/ftgzip.h rename to deps/freetype/include/freetype2/freetype/ftgzip.h diff --git a/deps/freetype/include/freetype/ftimage.h b/deps/freetype/include/freetype2/freetype/ftimage.h similarity index 100% rename from deps/freetype/include/freetype/ftimage.h rename to deps/freetype/include/freetype2/freetype/ftimage.h diff --git a/deps/freetype/include/freetype/ftincrem.h b/deps/freetype/include/freetype2/freetype/ftincrem.h similarity index 100% rename from deps/freetype/include/freetype/ftincrem.h rename to deps/freetype/include/freetype2/freetype/ftincrem.h diff --git a/deps/freetype/include/freetype/ftlcdfil.h b/deps/freetype/include/freetype2/freetype/ftlcdfil.h similarity index 100% rename from deps/freetype/include/freetype/ftlcdfil.h rename to deps/freetype/include/freetype2/freetype/ftlcdfil.h diff --git a/deps/freetype/include/freetype/ftlist.h b/deps/freetype/include/freetype2/freetype/ftlist.h similarity index 100% rename from deps/freetype/include/freetype/ftlist.h rename to deps/freetype/include/freetype2/freetype/ftlist.h diff --git a/deps/freetype/include/freetype/ftlzw.h b/deps/freetype/include/freetype2/freetype/ftlzw.h similarity index 100% rename from deps/freetype/include/freetype/ftlzw.h rename to deps/freetype/include/freetype2/freetype/ftlzw.h diff --git a/deps/freetype/include/freetype/ftmac.h b/deps/freetype/include/freetype2/freetype/ftmac.h similarity index 100% rename from deps/freetype/include/freetype/ftmac.h rename to deps/freetype/include/freetype2/freetype/ftmac.h diff --git a/deps/freetype/include/freetype/ftmm.h b/deps/freetype/include/freetype2/freetype/ftmm.h similarity index 100% rename from deps/freetype/include/freetype/ftmm.h rename to deps/freetype/include/freetype2/freetype/ftmm.h diff --git a/deps/freetype/include/freetype/ftmodapi.h b/deps/freetype/include/freetype2/freetype/ftmodapi.h similarity index 100% rename from deps/freetype/include/freetype/ftmodapi.h rename to deps/freetype/include/freetype2/freetype/ftmodapi.h diff --git a/deps/freetype/include/freetype/ftmoderr.h b/deps/freetype/include/freetype2/freetype/ftmoderr.h similarity index 100% rename from deps/freetype/include/freetype/ftmoderr.h rename to deps/freetype/include/freetype2/freetype/ftmoderr.h diff --git a/deps/freetype/include/freetype/ftotval.h b/deps/freetype/include/freetype2/freetype/ftotval.h similarity index 100% rename from deps/freetype/include/freetype/ftotval.h rename to deps/freetype/include/freetype2/freetype/ftotval.h diff --git a/deps/freetype/include/freetype/ftoutln.h b/deps/freetype/include/freetype2/freetype/ftoutln.h similarity index 100% rename from deps/freetype/include/freetype/ftoutln.h rename to deps/freetype/include/freetype2/freetype/ftoutln.h diff --git a/deps/freetype/include/freetype/ftparams.h b/deps/freetype/include/freetype2/freetype/ftparams.h similarity index 100% rename from deps/freetype/include/freetype/ftparams.h rename to deps/freetype/include/freetype2/freetype/ftparams.h diff --git a/deps/freetype/include/freetype/ftpfr.h b/deps/freetype/include/freetype2/freetype/ftpfr.h similarity index 100% rename from deps/freetype/include/freetype/ftpfr.h rename to deps/freetype/include/freetype2/freetype/ftpfr.h diff --git a/deps/freetype/include/freetype/ftrender.h b/deps/freetype/include/freetype2/freetype/ftrender.h similarity index 100% rename from deps/freetype/include/freetype/ftrender.h rename to deps/freetype/include/freetype2/freetype/ftrender.h diff --git a/deps/freetype/include/freetype/ftsizes.h b/deps/freetype/include/freetype2/freetype/ftsizes.h similarity index 100% rename from deps/freetype/include/freetype/ftsizes.h rename to deps/freetype/include/freetype2/freetype/ftsizes.h diff --git a/deps/freetype/include/freetype/ftsnames.h b/deps/freetype/include/freetype2/freetype/ftsnames.h similarity index 100% rename from deps/freetype/include/freetype/ftsnames.h rename to deps/freetype/include/freetype2/freetype/ftsnames.h diff --git a/deps/freetype/include/freetype/ftstroke.h b/deps/freetype/include/freetype2/freetype/ftstroke.h similarity index 100% rename from deps/freetype/include/freetype/ftstroke.h rename to deps/freetype/include/freetype2/freetype/ftstroke.h diff --git a/deps/freetype/include/freetype/ftsynth.h b/deps/freetype/include/freetype2/freetype/ftsynth.h similarity index 100% rename from deps/freetype/include/freetype/ftsynth.h rename to deps/freetype/include/freetype2/freetype/ftsynth.h diff --git a/deps/freetype/include/freetype/ftsystem.h b/deps/freetype/include/freetype2/freetype/ftsystem.h similarity index 100% rename from deps/freetype/include/freetype/ftsystem.h rename to deps/freetype/include/freetype2/freetype/ftsystem.h diff --git a/deps/freetype/include/freetype/fttrigon.h b/deps/freetype/include/freetype2/freetype/fttrigon.h similarity index 100% rename from deps/freetype/include/freetype/fttrigon.h rename to deps/freetype/include/freetype2/freetype/fttrigon.h diff --git a/deps/freetype/include/freetype/fttypes.h b/deps/freetype/include/freetype2/freetype/fttypes.h similarity index 100% rename from deps/freetype/include/freetype/fttypes.h rename to deps/freetype/include/freetype2/freetype/fttypes.h diff --git a/deps/freetype/include/freetype/ftwinfnt.h b/deps/freetype/include/freetype2/freetype/ftwinfnt.h similarity index 100% rename from deps/freetype/include/freetype/ftwinfnt.h rename to deps/freetype/include/freetype2/freetype/ftwinfnt.h diff --git a/deps/freetype/include/freetype/t1tables.h b/deps/freetype/include/freetype2/freetype/t1tables.h similarity index 100% rename from deps/freetype/include/freetype/t1tables.h rename to deps/freetype/include/freetype2/freetype/t1tables.h diff --git a/deps/freetype/include/freetype/ttnameid.h b/deps/freetype/include/freetype2/freetype/ttnameid.h similarity index 100% rename from deps/freetype/include/freetype/ttnameid.h rename to deps/freetype/include/freetype2/freetype/ttnameid.h diff --git a/deps/freetype/include/freetype/tttables.h b/deps/freetype/include/freetype2/freetype/tttables.h similarity index 100% rename from deps/freetype/include/freetype/tttables.h rename to deps/freetype/include/freetype2/freetype/tttables.h diff --git a/deps/freetype/include/freetype/tttags.h b/deps/freetype/include/freetype2/freetype/tttags.h similarity index 100% rename from deps/freetype/include/freetype/tttags.h rename to deps/freetype/include/freetype2/freetype/tttags.h diff --git a/deps/freetype/include/ft2build.h b/deps/freetype/include/freetype2/ft2build.h similarity index 100% rename from deps/freetype/include/ft2build.h rename to deps/freetype/include/freetype2/ft2build.h