From 2eaf0cf8fd6e7c290497fedb08134a89e7b49b1d Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Thu, 19 Mar 2015 17:34:42 +0400 Subject: Update bundled FreeType to 2.5.5 Removed everything, imported with help of import_from_tarball.sh script, and then added a pre-generated builds/unix/ftconfig.h Task-number: QTBUG-44648 Change-Id: Iea948e41f7761f1580382b3763d04c7a61383382 Reviewed-by: Lars Knoll --- .../amiga/include/freetype/config/ftconfig.h | 55 ------- .../amiga/include/freetype/config/ftmodule.h | 160 --------------------- 2 files changed, 215 deletions(-) delete mode 100644 src/3rdparty/freetype/builds/amiga/include/freetype/config/ftconfig.h delete mode 100644 src/3rdparty/freetype/builds/amiga/include/freetype/config/ftmodule.h (limited to 'src/3rdparty/freetype/builds/amiga/include/freetype') diff --git a/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftconfig.h b/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftconfig.h deleted file mode 100644 index c2c2ac8dbb..0000000000 --- a/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftconfig.h +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************/ -/* */ -/* ftconfig.h */ -/* */ -/* Amiga-specific configuration file (specification only). */ -/* */ -/* Copyright 2005, 2006, 2007 by */ -/* Werner Lemberg and Detlef Würkner. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - -/* - * This is an example how to override the default FreeType2 header files - * with Amiga-specific changes. When the compiler searches this directory - * before the default directory, we can do some modifications. - * - * Here we must change FT_EXPORT_DEF so that SAS/C does - * generate the needed XDEFs. - */ - -#if 0 -#define FT_EXPORT_DEF( x ) extern x -#endif - -#undef FT_EXPORT_DEF -#define FT_EXPORT_DEF( x ) x - -/* Now include the original file */ -#ifndef __MORPHOS__ -#ifdef __SASC -#include "FT:include/freetype/config/ftconfig.h" -#else -#include "/FT/include/freetype/config/ftconfig.h" -#endif -#else -/* We must define that, it seems that - * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in - * ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf - * binaries from http://www.morphos.de) - */ -#define _LIBC_LIMITS_H_ -#include "/FT/include/freetype/config/ftconfig.h" -#endif - -/* -Local Variables: -coding: latin-1 -End: -*/ diff --git a/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftmodule.h b/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftmodule.h deleted file mode 100644 index 5873bab74f..0000000000 --- a/src/3rdparty/freetype/builds/amiga/include/freetype/config/ftmodule.h +++ /dev/null @@ -1,160 +0,0 @@ -/***************************************************************************/ -/* */ -/* ftmodule.h */ -/* */ -/* Amiga-specific FreeType module selection. */ -/* */ -/* Copyright 2005 by */ -/* Werner Lemberg and Detlef Würkner. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - -/* - * To avoid that all your programs include all FreeType modules, - * you copy the following piece of source code into your own - * source file and specify which modules you really need in your - * application by uncommenting the appropriate lines. - */ -/* -//#define FT_USE_AUTOFIT // autofitter -//#define FT_USE_RASTER // monochrome rasterizer -//#define FT_USE_SMOOTH // anti-aliasing rasterizer -//#define FT_USE_TT // truetype font driver -//#define FT_USE_T1 // type1 font driver -//#define FT_USE_T42 // type42 font driver -//#define FT_USE_T1CID // cid-keyed type1 font driver // no cmap support -//#define FT_USE_CFF // opentype font driver -//#define FT_USE_BDF // bdf bitmap font driver -//#define FT_USE_PCF // pcf bitmap font driver -//#define FT_USE_PFR // pfr font driver -//#define FT_USE_WINFNT // windows .fnt|.fon bitmap font driver -//#define FT_USE_OTV // opentype validator -//#define FT_USE_GXV // truetype gx validator -#include "FT:src/base/ftinit.c" -*/ - -/* Make sure that the needed support modules are built in. - * Dependencies can be found by searching for FT_Get_Module. - */ - -#ifdef FT_USE_T42 -#define FT_USE_TT -#endif - -#ifdef FT_USE_TT -#define FT_USE_SFNT -#endif - -#ifdef FT_USE_CFF -#define FT_USE_SFNT -#define FT_USE_PSHINT -#define FT_USE_PSNAMES -#endif - -#ifdef FT_USE_T1 -#define FT_USE_PSAUX -#define FT_USE_PSHINT -#define FT_USE_PSNAMES -#endif - -#ifdef FT_USE_T1CID -#define FT_USE_PSAUX -#define FT_USE_PSHINT -#define FT_USE_PSNAMES -#endif - -#ifdef FT_USE_PSAUX -#define FT_USE_PSNAMES -#endif - -#ifdef FT_USE_SFNT -#define FT_USE_PSNAMES -#endif - -/* Now include the modules */ - -#ifdef FT_USE_AUTOFIT -FT_USE_MODULE( FT_Module_Class, autofit_module_class ) -#endif - -#ifdef FT_USE_TT -FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class ) -#endif - -#ifdef FT_USE_T1 -FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) -#endif - -#ifdef FT_USE_CFF -FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class ) -#endif - -#ifdef FT_USE_T1CID -FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) -#endif - -#ifdef FT_USE_PFR -FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) -#endif - -#ifdef FT_USE_T42 -FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) -#endif - -#ifdef FT_USE_WINFNT -FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) -#endif - -#ifdef FT_USE_PCF -FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) -#endif - -#ifdef FT_USE_PSAUX -FT_USE_MODULE( FT_Module_Class, psaux_module_class ) -#endif - -#ifdef FT_USE_PSNAMES -FT_USE_MODULE( FT_Module_Class, psnames_module_class ) -#endif - -#ifdef FT_USE_PSHINT -FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) -#endif - -#ifdef FT_USE_RASTER -FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) -#endif - -#ifdef FT_USE_SFNT -FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) -#endif - -#ifdef FT_USE_SMOOTH -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 ) -#endif - -#ifdef FT_USE_OTV -FT_USE_MODULE( FT_Module_Class, otv_module_class ) -#endif - -#ifdef FT_USE_BDF -FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) -#endif - -#ifdef FT_USE_GXV -FT_USE_MODULE( FT_Module_Class, gxv_module_class ) -#endif - -/* -Local Variables: -coding: latin-1 -End: -*/ -- cgit v1.2.3