[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61423] trunk/lib/win64_vc12/ freetype: Bump freetype to 2.5.3 and fix linking errors
Martijn Berger
martijn.berger at gmail.com
Wed Sep 3 17:01:38 CEST 2014
Revision: 61423
https://developer.blender.org/rBL61423
Author: juicyfruit
Date: 2014-09-03 15:01:37 +0000 (Wed, 03 Sep 2014)
Log Message:
-----------
Bump freetype to 2.5.3 and fix linking errors
Modified Paths:
--------------
trunk/lib/win64_vc12/freetype/build.bat
trunk/lib/win64_vc12/freetype/include/freetype2/config/ftconfig.h
trunk/lib/win64_vc12/freetype/include/freetype2/config/ftheader.h
trunk/lib/win64_vc12/freetype/include/freetype2/config/ftmodule.h
trunk/lib/win64_vc12/freetype/include/freetype2/config/ftoption.h
trunk/lib/win64_vc12/freetype/include/freetype2/config/ftstdlib.h
trunk/lib/win64_vc12/freetype/include/freetype2/freetype.h
trunk/lib/win64_vc12/freetype/include/freetype2/ft2build.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftadvanc.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftautoh.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftbbox.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftbdf.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftbitmap.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftbzip2.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftcache.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftcffdrv.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftchapters.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftcid.h
trunk/lib/win64_vc12/freetype/include/freetype2/fterrdef.h
trunk/lib/win64_vc12/freetype/include/freetype2/fterrors.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftgasp.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftglyph.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftgxval.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftgzip.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftimage.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftincrem.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftlcdfil.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftlist.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftlzw.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftmac.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftmm.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftmodapi.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftmoderr.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftotval.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftoutln.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftpfr.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftrender.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftsizes.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftsnames.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftstroke.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftsynth.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftsystem.h
trunk/lib/win64_vc12/freetype/include/freetype2/fttrigon.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftttdrv.h
trunk/lib/win64_vc12/freetype/include/freetype2/fttypes.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftwinfnt.h
trunk/lib/win64_vc12/freetype/include/freetype2/ftxf86.h
trunk/lib/win64_vc12/freetype/include/freetype2/t1tables.h
trunk/lib/win64_vc12/freetype/include/freetype2/ttnameid.h
trunk/lib/win64_vc12/freetype/include/freetype2/tttables.h
trunk/lib/win64_vc12/freetype/include/freetype2/tttags.h
trunk/lib/win64_vc12/freetype/include/freetype2/ttunpat.h
trunk/lib/win64_vc12/freetype/lib/freetype2ST.lib
trunk/lib/win64_vc12/freetype/lib/freetype2ST_d.lib
Modified: trunk/lib/win64_vc12/freetype/build.bat
===================================================================
--- trunk/lib/win64_vc12/freetype/build.bat 2014-08-31 06:37:12 UTC (rev 61422)
+++ trunk/lib/win64_vc12/freetype/build.bat 2014-09-03 15:01:37 UTC (rev 61423)
@@ -1,14 +1,16 @@
@Echo off
-cd freetype-2.5.2
+cd freetype-2.5.3
set LIBDIR=%CD%\..\..
+:: /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib
+
:: create build directory
mkdir build\windows
cd build\windows
-cmake -G "NMake Makefiles" ..\..\ ^
+cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\freetype ^
-DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
@@ -18,9 +20,10 @@
-DCMAKE_DEBUG_POSTFIX:STRING="2ST_d" ^
-DCMAKE_BUILD_TYPE=Release
-nmake
-nmake install
+msbuild /p:Configuration=Release /t:Build /p:Platform="x64" freetype.sln
+msbuild /p:Configuration=Release /t:Build /p:Platform="x64" INSTALL.vcxproj
+
cd ..\..
:: create build directory
@@ -27,17 +30,18 @@
mkdir build\windows_debug
cd build\windows_debug
-cmake -G "NMake Makefiles" ..\..\ ^
+cmake -G "Visual Studio 12 2013 Win64" ..\..\ ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\freetype ^
-DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
+ -DCMAKE_MODULE_LINKER_FLAGS="/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib" ^
-DCMAKE_RELEASE_POSTFIX:STRING="2ST" ^
-DCMAKE_DEBUG_POSTFIX:STRING="2ST_d" ^
-DCMAKE_BUILD_TYPE=Debug
- nmake
- nmake install
+msbuild /p:Configuration=Debug /t:Build /p:Platform="x64" freetype.sln
+msbuild /p:Configuration=Debug /t:Build /p:Platform="x64" INSTALL.vcxproj
cd ..\..\..
Modified: trunk/lib/win64_vc12/freetype/include/freetype2/config/ftconfig.h
===================================================================
--- trunk/lib/win64_vc12/freetype/include/freetype2/config/ftconfig.h 2014-08-31 06:37:12 UTC (rev 61422)
+++ trunk/lib/win64_vc12/freetype/include/freetype2/config/ftconfig.h 2014-09-03 15:01:37 UTC (rev 61423)
@@ -1,672 +1,672 @@
-/***************************************************************************/
-/* */
-/* ftconfig.h */
-/* */
-/* ANSI-specific configuration file (specification only). */
-/* */
-/* Copyright 1996-2004, 2006-2008, 2010-2011, 2013 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 */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list