[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61424] trunk/lib/windows_vc12/ freetype: Bump freetype to 2.5.3 and fix linking errors
Martijn Berger
martijn.berger at gmail.com
Thu Sep 4 10:53:38 CEST 2014
Revision: 61424
https://developer.blender.org/rBL61424
Author: juicyfruit
Date: 2014-09-04 08:53:36 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
Bump freetype to 2.5.3 and fix linking errors
Modified Paths:
--------------
trunk/lib/windows_vc12/freetype/lib/freetype2ST.lib
trunk/lib/windows_vc12/freetype/lib/freetype2ST_d.lib
Added Paths:
-----------
trunk/lib/windows_vc12/freetype/include/freetype2/
trunk/lib/windows_vc12/freetype/include/freetype2/config/
trunk/lib/windows_vc12/freetype/include/freetype2/config/ftconfig.h
trunk/lib/windows_vc12/freetype/include/freetype2/config/ftheader.h
trunk/lib/windows_vc12/freetype/include/freetype2/config/ftmodule.h
trunk/lib/windows_vc12/freetype/include/freetype2/config/ftoption.h
trunk/lib/windows_vc12/freetype/include/freetype2/config/ftstdlib.h
trunk/lib/windows_vc12/freetype/include/freetype2/freetype.h
trunk/lib/windows_vc12/freetype/include/freetype2/ft2build.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftadvanc.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftautoh.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftbbox.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftbdf.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftbitmap.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftbzip2.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftcache.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftcffdrv.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftchapters.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftcid.h
trunk/lib/windows_vc12/freetype/include/freetype2/fterrdef.h
trunk/lib/windows_vc12/freetype/include/freetype2/fterrors.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftgasp.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftglyph.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftgxval.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftgzip.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftimage.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftincrem.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftlcdfil.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftlist.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftlzw.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftmac.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftmm.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftmodapi.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftmoderr.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftotval.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftoutln.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftpfr.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftrender.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftsizes.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftsnames.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftstroke.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftsynth.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftsystem.h
trunk/lib/windows_vc12/freetype/include/freetype2/fttrigon.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftttdrv.h
trunk/lib/windows_vc12/freetype/include/freetype2/fttypes.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftwinfnt.h
trunk/lib/windows_vc12/freetype/include/freetype2/ftxf86.h
trunk/lib/windows_vc12/freetype/include/freetype2/t1tables.h
trunk/lib/windows_vc12/freetype/include/freetype2/ttnameid.h
trunk/lib/windows_vc12/freetype/include/freetype2/tttables.h
trunk/lib/windows_vc12/freetype/include/freetype2/tttags.h
trunk/lib/windows_vc12/freetype/include/freetype2/ttunpat.h
Added: trunk/lib/windows_vc12/freetype/include/freetype2/config/ftconfig.h
===================================================================
--- trunk/lib/windows_vc12/freetype/include/freetype2/config/ftconfig.h (rev 0)
+++ trunk/lib/windows_vc12/freetype/include/freetype2/config/ftconfig.h 2014-09-04 08:53:36 UTC (rev 61424)
@@ -0,0 +1,672 @@
+/***************************************************************************/
+/* */
+/* ftconfig.h */
+/* */
+/* ANSI-specific configuration file (specification only). */
+/* */
+/* Copyright 1996-2004, 2006-2008, 2010-2011, 2013, 2014 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* 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 header file contains a number of macro definitions that are used */
+ /* by the rest of the engine. Most of the macros here are automatically */
+ /* determined at compile time, and you should not need to change it to */
+ /* port FreeType, except to compile the library with a non-ANSI */
+ /* compiler. */
+ /* */
+ /* Note however that if some specific modifications are needed, we */
+ /* advise you to place a modified copy in your build directory. */
+ /* */
+ /* The build directory is usually `builds/<system>', and contains */
+ /* system-specific files that are always included first when building */
+ /* the library. */
+ /* */
+ /* This ANSI version should stay in `include/config/'. */
+ /* */
+ /*************************************************************************/
+
+#ifndef __FTCONFIG_H__
+#define __FTCONFIG_H__
+
+#include <ft2build.h>
+#include FT_CONFIG_OPTIONS_H
+#include FT_CONFIG_STANDARD_LIBRARY_H
+
+
+FT_BEGIN_HEADER
+
+
+ /*************************************************************************/
+ /* */
+ /* PLATFORM-SPECIFIC CONFIGURATION MACROS */
+ /* */
+ /* These macros can be toggled to suit a specific system. The current */
+ /* ones are defaults used to compile FreeType in an ANSI C environment */
+ /* (16bit compilers are also supported). Copy this file to your own */
+ /* `builds/<system>' directory, and edit it to port the engine. */
+ /* */
+ /*************************************************************************/
+
+
+ /* There are systems (like the Texas Instruments 'C54x) where a `char' */
+ /* has 16 bits. ANSI C says that sizeof(char) is always 1. Since an */
+ /* `int' has 16 bits also for this system, sizeof(int) gives 1 which */
+ /* is probably unexpected. */
+ /* */
+ /* `CHAR_BIT' (defined in limits.h) gives the number of bits in a */
+ /* `char' type. */
+
+#ifndef FT_CHAR_BIT
+#define FT_CHAR_BIT CHAR_BIT
+#endif
+
+
+ /* The size of an `int' type. */
+#if FT_UINT_MAX == 0xFFFFUL
+#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
+#elif FT_UINT_MAX == 0xFFFFFFFFUL
+#define FT_SIZEOF_INT (32 / FT_CHAR_BIT)
+#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
+#define FT_SIZEOF_INT (64 / FT_CHAR_BIT)
+#else
+#error "Unsupported size of `int' type!"
+#endif
+
+ /* The size of a `long' type. A five-byte `long' (as used e.g. on the */
+ /* DM642) is recognized but avoided. */
+#if FT_ULONG_MAX == 0xFFFFFFFFUL
+#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
+#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
+#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
+#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
+#define FT_SIZEOF_LONG (64 / FT_CHAR_BIT)
+#else
+#error "Unsupported size of `long' type!"
+#endif
+
+
+ /* FT_UNUSED is a macro used to indicate that a given parameter is not */
+ /* used -- this is only used to get rid of unpleasant compiler warnings */
+#ifndef FT_UNUSED
+#define FT_UNUSED( arg ) ( (arg) = (arg) )
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* AUTOMATIC CONFIGURATION MACROS */
+ /* */
+ /* These macros are computed from the ones defined above. Don't touch */
+ /* their definition, unless you know precisely what you are doing. No */
+ /* porter should need to mess with them. */
+ /* */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* Mac support */
+ /* */
+ /* This is the only necessary change, so it is defined here instead */
+ /* providing a new configuration file. */
+ /* */
+#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) )
+ /* no Carbon frameworks for 64bit 10.4.x */
+ /* AvailabilityMacros.h is available since Mac OS X 10.2, */
+ /* so guess the system version by maximum errno before inclusion */
+#include <errno.h>
+#ifdef ECANCELED /* defined since 10.2 */
+#include "AvailabilityMacros.h"
+#endif
+#if defined( __LP64__ ) && \
+ ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#undef FT_MACINTOSH
+#endif
+
+#elif defined( __SC__ ) || defined( __MRC__ )
+ /* Classic MacOS compilers */
+#include "ConditionalMacros.h"
+#if TARGET_OS_MAC
+#define FT_MACINTOSH 1
+#endif
+
+#endif
+
+
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* basic_types */
+ /* */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Int16 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 16bit signed integer type. */
+ /* */
+ typedef signed short FT_Int16;
+
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_UInt16 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 16bit unsigned integer type. */
+ /* */
+ typedef unsigned short FT_UInt16;
+
+ /* */
+
+
+ /* this #if 0 ... #endif clause is for documentation purposes */
+#if 0
+
+ /*************************************************************************/
+ /* */
+ /* <Type> */
+ /* FT_Int32 */
+ /* */
+ /* <Description> */
+ /* A typedef for a 32bit signed integer type. The size depends on */
+ /* the configuration. */
+ /* */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list