From 00666832a756014eef48c4f5bd8484cc1299bdf0 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Aug 2010 07:57:52 +0000 Subject: Updated to freetype 2.4.2 --- freetype/builds/unix/config.guess | 4 +- freetype/builds/unix/configure | 20 +++--- freetype/builds/unix/configure.ac | 4 +- freetype/builds/unix/configure.raw | 2 +- freetype/builds/unix/ftconfig.in | 2 +- freetype/builds/win32/vc2005/freetype.vcproj | 12 ++-- freetype/builds/win32/vc2005/index.html | 10 +-- freetype/builds/win32/vc2008/freetype.vcproj | 12 ++-- freetype/builds/win32/vc2008/index.html | 10 +-- freetype/builds/win32/visualc/freetype.dsp | 20 +++--- freetype/builds/win32/visualc/freetype.vcproj | 12 ++-- freetype/builds/win32/visualc/index.html | 10 +-- freetype/builds/win32/visualce/freetype.dsp | 20 +++--- freetype/builds/win32/visualce/freetype.vcproj | 84 ++++++++++++------------- freetype/builds/win32/visualce/index.html | 10 +-- freetype/builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++----------- freetype/builds/wince/vc2005-ce/index.html | 10 +-- freetype/builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++----------- freetype/builds/wince/vc2008-ce/index.html | 10 +-- 19 files changed, 202 insertions(+), 202 deletions(-) (limited to 'freetype/builds') diff --git a/freetype/builds/unix/config.guess b/freetype/builds/unix/config.guess index 115f944a6..4e621ac4a 100644 --- a/freetype/builds/unix/config.guess +++ b/freetype/builds/unix/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-04-03' +timestamp='2010-07-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -552,7 +552,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 diff --git a/freetype/builds/unix/configure b/freetype/builds/unix/configure index e04d6d9bf..0469daafa 100644 --- a/freetype/builds/unix/configure +++ b/freetype/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for FreeType 2.4.1. +# Generated by GNU Autoconf 2.65 for FreeType 2.4.2. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.4.1' -PACKAGE_STRING='FreeType 2.4.1' +PACKAGE_VERSION='2.4.2' +PACKAGE_STRING='FreeType 2.4.2' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.4.1 to adapt to many kinds of systems. +\`configure' configures FreeType 2.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.4.1:";; + short | recursive ) echo "Configuration of FreeType 2.4.2:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.4.1 +FreeType configure 2.4.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2173,7 +2173,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.4.1, which was +It was created by FreeType $as_me 2.4.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2528,7 +2528,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:0:6' ft_version=`echo $version_info | tr : .` @@ -12318,7 +12318,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.4.1, which was +This file was extended by FreeType $as_me 2.4.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12384,7 +12384,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeType config.status 2.4.1 +FreeType config.status 2.4.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/freetype/builds/unix/configure.ac b/freetype/builds/unix/configure.ac index 1a237d5e2..6ffddd069 100644 --- a/freetype/builds/unix/configure.ac +++ b/freetype/builds/unix/configure.ac @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.4.1], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.4.2], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:0:6' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/freetype/builds/unix/configure.raw b/freetype/builds/unix/configure.raw index 4ef9521d7..0622127d6 100644 --- a/freetype/builds/unix/configure.raw +++ b/freetype/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:0:6' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/freetype/builds/unix/ftconfig.in b/freetype/builds/unix/ftconfig.in index c5e4e46b4..4c81187e5 100644 --- a/freetype/builds/unix/ftconfig.in +++ b/freetype/builds/unix/ftconfig.in @@ -313,7 +313,7 @@ FT_BEGIN_HEADER #endif /* __arm__ && !__thumb__ */ -#if defined( i386 ) +#if defined( __i386__ ) #define FT_MULFIX_ASSEMBLER FT_MulFix_i386 static __inline__ FT_Int32 diff --git a/freetype/builds/win32/vc2005/freetype.vcproj b/freetype/builds/win32/vc2005/freetype.vcproj index cfed996b8..f6f26b95a 100644 --- a/freetype/builds/win32/vc2005/freetype.vcproj +++ b/freetype/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/freetype/builds/win32/vc2005/index.html b/freetype/builds/win32/vc2005/index.html index 446a63ef6..ad80514f3 100644 --- a/freetype/builds/win32/vc2005/index.html +++ b/freetype/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.2 sources:

    -    freetype241.lib     - release build; single threaded
    -    freetype241_D.lib   - debug build;   single threaded
    -    freetype241MT.lib   - release build; multi-threaded
    -    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/vc2008/freetype.vcproj b/freetype/builds/win32/vc2008/freetype.vcproj index d5a6577b7..2fe5d1dc2 100644 --- a/freetype/builds/win32/vc2008/freetype.vcproj +++ b/freetype/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.2 sources:

    -    freetype241.lib     - release build; single threaded
    -    freetype241_D.lib   - debug build;   single threaded
    -    freetype241MT.lib   - release build; multi-threaded
    -    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/visualc/freetype.dsp b/freetype/builds/win32/visualc/freetype.dsp index 86a8444da..e09b1b882 100644 --- a/freetype/builds/win32/visualc/freetype.dsp +++ b/freetype/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype242_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype242.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype241ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype242.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype242ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype242_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242ST_D.lib" !ENDIF diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index c144bfc36..1a60d5789 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.2 sources:

    -    freetype241.lib     - release build; single threaded
    -    freetype241_D.lib   - debug build;   single threaded
    -    freetype241MT.lib   - release build; multi-threaded
    -    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/win32/visualce/freetype.dsp b/freetype/builds/win32/visualce/freetype.dsp index 86a8444da..e09b1b882 100644 --- a/freetype/builds/win32/visualce/freetype.dsp +++ b/freetype/builds/win32/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype242_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype242.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype241ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype242.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype242ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype242_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242ST_D.lib" !ENDIF diff --git a/freetype/builds/win32/visualce/freetype.vcproj b/freetype/builds/win32/visualce/freetype.vcproj index be58cd8ba..4da9c7d13 100644 --- a/freetype/builds/win32/visualce/freetype.vcproj +++ b/freetype/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.1 sources:

+It compiles the following libraries from the FreeType 2.4.2 sources:

    -    freetype241.lib     - release build; single threaded
    -    freetype241_D.lib   - debug build;   single threaded
    -    freetype241MT.lib   - release build; multi-threaded
    -    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/wince/vc2005-ce/freetype.vcproj b/freetype/builds/wince/vc2005-ce/freetype.vcproj index 4a1fdb21d..1016ddee2 100644 --- a/freetype/builds/wince/vc2005-ce/freetype.vcproj +++ b/freetype/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/freetype/builds/wince/vc2005-ce/index.html b/freetype/builds/wince/vc2005-ce/index.html index c3e692095..c13e86e06 100644 --- a/freetype/builds/wince/vc2005-ce/index.html +++ b/freetype/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
  • -It compiles the following libraries from the FreeType 2.4.1 sources:

    +It compiles the following libraries from the FreeType 2.4.2 sources:

      -    freetype241.lib     - release build; single threaded
      -    freetype241_D.lib   - debug build;   single threaded
      -    freetype241MT.lib   - release build; multi-threaded
      -    freetype241MT_D.lib - debug build;   multi-threaded
      + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/freetype/builds/wince/vc2008-ce/freetype.vcproj b/freetype/builds/wince/vc2008-ce/freetype.vcproj index 76b63876d..1e4c00fb8 100644 --- a/freetype/builds/wince/vc2008-ce/freetype.vcproj +++ b/freetype/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.1 sources:

    +It compiles the following libraries from the FreeType 2.4.2 sources:

      -    freetype241.lib     - release build; single threaded
      -    freetype241_D.lib   - debug build;   single threaded
      -    freetype241MT.lib   - release build; multi-threaded
      -    freetype241MT_D.lib - debug build;   multi-threaded
      + freetype242.lib - release build; single threaded + freetype242_D.lib - debug build; single threaded + freetype242MT.lib - release build; multi-threaded + freetype242MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP -- cgit v1.2.3