Commit 8cabd919 authored by Werner Lemberg's avatar Werner Lemberg

* Version 2.6.1 released.

=========================

Tag sources with `VER-2-6-1'.

* docs/VERSION.DLL: Update documentation and bump version number to
2.6.1.

* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
builds/windows/vc2005/index.html,
builds/windows/vc2008/freetype.vcproj,
builds/windows/vc2008/index.html,
builds/windows/vc2010/freetype.vcxproj,
builds/windows/vc2010/index.html,
builds/windows/visualc/freetype.dsp,
builds/windows/visualc/freetype.vcproj,
builds/windows/visualc/index.html,
builds/windows/visualce/freetype.dsp,
builds/windows/visualce/freetype.vcproj,
builds/windows/visualce/index.html,
builds/wince/vc2005-ce/freetype.vcproj,
builds/wince/vc2005-ce/index.html,
builds/wince/vc2008-ce/freetype.vcproj,
builds/wince/vc2008-ce/index.html: s/2.6/2.6.1/, s/26/261/.

* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.

* builds/unix/configure.raw (version_info): Set to 18:1:12.
* CMakeLists.txt (VERSION_PATCH): Set to 1.

* src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for
dumping functions.
parent b260dc9f
......@@ -139,7 +139,7 @@ endif ()
set(VERSION_MAJOR "2")
set(VERSION_MINOR "6")
set(VERSION_PATCH "0")
set(VERSION_PATCH "1")
set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
......
2015-10-03 Werner Lemberg <wl@gnu.org>
2015-10-04 Werner Lemberg <wl@gnu.org>
* Version 2.6.1 released.
=========================
Tag sources with `VER-2-6-1'.
* docs/VERSION.DLL: Update documentation and bump version number to
2.6.1.
* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
builds/windows/vc2005/index.html,
builds/windows/vc2008/freetype.vcproj,
builds/windows/vc2008/index.html,
builds/windows/vc2010/freetype.vcxproj,
builds/windows/vc2010/index.html,
builds/windows/visualc/freetype.dsp,
builds/windows/visualc/freetype.vcproj,
builds/windows/visualc/index.html,
builds/windows/visualce/freetype.dsp,
builds/windows/visualce/freetype.vcproj,
builds/windows/visualce/index.html,
builds/wince/vc2005-ce/freetype.vcproj,
builds/wince/vc2005-ce/index.html,
builds/wince/vc2008-ce/freetype.vcproj,
builds/wince/vc2008-ce/index.html: s/2.6/2.6.1/, s/26/261/.
* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
* builds/unix/configure.raw (version_info): Set to 18:1:12.
* CMakeLists.txt (VERSION_PATCH): Set to 1.
* src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for
dumping functions.
2015-10-04 Werner Lemberg <wl@gnu.org>
[bzip2, gzip] Avoid access of unitialized memory (#46109).
......@@ -1098,8 +1134,8 @@
(FREETYPE_PATCH): Set to 0.
* builds/unix/configure.raw (version_info): Set to 18:0:12.
* CMakeLists.txt (VERSION_MINOR): Set to 0.
(VERSION_PATCH): Set to 6.
* CMakeLists.txt (VERSION_MINOR): Set to 6.
(VERSION_PATCH): Set to 0.
* src/autofit/afmodule.c [!FT_MAKE_OPTION_SINGLE_OBJECT]: Add
declarations for dumping functions.
......
......@@ -197,7 +197,7 @@ actions RefDoc
{
python $(FT2_SRC)/tools/docmaker/docmaker.py
--prefix=ft2
--title=FreeType-2.6
--title=FreeType-2.6.1
--output=$(DOC_DIR)
$(FT2_INCLUDE)/freetype/*.h
$(FT2_INCLUDE)/freetype/config/*.h
......
FreeType 2.6
============
FreeType 2.6.1
==============
Homepage: http://www.freetype.org
......@@ -24,9 +24,9 @@
and download one of the following files.
freetype-doc-2.6.tar.bz2
freetype-doc-2.6.tar.gz
ftdoc26.zip
freetype-doc-2.6.1.tar.bz2
freetype-doc-2.6.1.tar.gz
ftdoc261.zip
To view the documentation online, go to
......
......@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
version_info='18:0:12'
version_info='18:1:12'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
......
This diff is collapsed.
......@@ -21,22 +21,22 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.6 sources:</p>
It compiles the following libraries from the FreeType 2.6.1 sources:</p>
<ul>
<pre>
freetype26.lib - release build; single threaded
freetype26_D.lib - debug build; single threaded
freetype26MT.lib - release build; multi-threaded
freetype26MT_D.lib - debug build; multi-threaded</pre>
freetype261.lib - release build; single threaded
freetype261_D.lib - debug build; single threaded
freetype261MT.lib - release build; multi-threaded
freetype261MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
archives are already stored this way, so no further action is required. If
you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
tool to convert the line endings. For example, with <a
href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
file smart CR/LF Conversion</it> option. Alternatively, you may consider
href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
file smart CR/LF Conversion</em> option. Alternatively, you may consider
using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
around, which specifically deal with this particular problem.
......
......@@ -88,7 +88,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -266,7 +266,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -355,7 +355,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -444,7 +444,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -533,7 +533,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -621,7 +621,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -709,7 +709,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -797,7 +797,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -885,7 +885,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -973,7 +973,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -1061,7 +1061,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -1149,7 +1149,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1236,7 +1236,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1323,7 +1323,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1410,7 +1410,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1497,7 +1497,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1584,7 +1584,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -1668,7 +1668,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -1753,7 +1753,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -1838,7 +1838,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -1923,7 +1923,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2008,7 +2008,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2093,7 +2093,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2178,7 +2178,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2263,7 +2263,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2348,7 +2348,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2433,7 +2433,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2518,7 +2518,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2603,7 +2603,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2689,7 +2689,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2775,7 +2775,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2861,7 +2861,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -2947,7 +2947,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -3033,7 +3033,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -3119,7 +3119,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -3205,7 +3205,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -3279,7 +3279,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......
......@@ -21,22 +21,22 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.6 sources:</p>
It compiles the following libraries from the FreeType 2.6.1 sources:</p>
<ul>
<pre>
freetype26.lib - release build; single threaded
freetype26_D.lib - debug build; single threaded
freetype26MT.lib - release build; multi-threaded
freetype26MT_D.lib - debug build; multi-threaded</pre>
freetype261.lib - release build; single threaded
freetype261_D.lib - debug build; single threaded
freetype261MT.lib - release build; multi-threaded
freetype261MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
archives are already stored this way, so no further action is required. If
you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
tool to convert the line endings. For example, with <a
href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
file smart CR/LF Conversion</it> option. Alternatively, you may consider
href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
file smart CR/LF Conversion</em> option. Alternatively, you may consider
using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
around, which specifically deal with this particular problem.
......
......@@ -16,7 +16,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......@@ -33,7 +33,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261MT.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......@@ -50,7 +50,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26ST.lib" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261ST.lib" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......@@ -67,7 +67,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......@@ -84,7 +84,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261ST_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......@@ -101,7 +101,7 @@
<Tool Name="VCManagedResourceCompilerTool" />
<Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />
<Tool Name="VCPreLinkEventTool" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype26MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261MT_D.lib" SuppressStartupBanner="true" />
<Tool Name="VCALinkTool" />
<Tool Name="VCXDCMakeTool" />
<Tool Name="VCBscMakeTool" />
......
......@@ -11,22 +11,22 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.6 sources:</p>
compiles the following libraries from the FreeType 2.6.1 sources:</p>
<ul>
<pre>
freetype26.lib - release build; single threaded
freetype26_D.lib - debug build; single threaded
freetype26MT.lib - release build; multi-threaded
freetype26MT_D.lib - debug build; multi-threaded</pre>
freetype261.lib - release build; single threaded
freetype261_D.lib - debug build; single threaded
freetype261MT.lib - release build; multi-threaded
freetype261MT_D.lib - debug build; multi-threaded</pre>
</ul>
<p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
archives are already stored this way, so no further action is required. If
you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
tool to convert the line endings. For example, with <a
href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
file smart CR/LF Conversion</it> option. Alternatively, you may consider
href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
file smart CR/LF Conversion</em> option. Alternatively, you may consider
using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
around, which specifically deal with this particular problem.
......
......@@ -70,7 +70,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -145,7 +145,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26MT.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261MT.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -220,7 +220,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26ST.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261ST.lib"
/>
<Tool
Name="VCALinkTool"
......@@ -292,7 +292,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -365,7 +365,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26ST_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......@@ -439,7 +439,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\objs\win32\vc2008\freetype26MT_D.lib"
OutputFile="..\..\..\objs\win32\vc2008\freetype261MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
......
......@@ -11,22 +11,22 @@
<p>This directory contains project files for Visual C++, named
<tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It
compiles the following libraries from the FreeType 2.6 sources:</p>
compiles the following libraries from the FreeType 2.6.1 sources:</p>
<ul>
<pre>
freetype26.lib - release build; single threaded
freetype26_D.lib - debug build; single threaded
freetype26MT.lib - release build; multi-threaded
freetype26MT_D.lib - debug build; multi-threaded</pre>