From 94926686b180c1c0575e7cb681e2b688220c3c4b Mon Sep 17 00:00:00 2001
From: Werner Lemberg
- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index d5afdac10..d0d21a0bf 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -88,7 +88,7 @@
/>
- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj
index caebeaf65..7f165db33 100644
--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/vc2005/freetype.vcproj
@@ -16,7 +16,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.5.3 sources:
+compiles the following libraries from the FreeType 2.5.4 sources:- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj
index b4baaeda6..49c4b04cf 100644
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -70,7 +70,7 @@
/>
- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index cf12ded97..5a9ce424d 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -191,18 +191,18 @@
This directory contains a project file for Visual C++ (VS.NET 2010
or newer), named freetype.vcxproj, and Visual Studio, called
freetype.sln. It compiles the following libraries from the
-FreeType 2.5.3 sources:
-freetype253.lib - release build -freetype253d.lib - debug build -freetype253ST.lib - release build; single threaded -freetype253STd.lib - debug build; single threaded -freetype253MT.lib - release build; multi-threaded -freetype253MTd.lib - debug build; multi-threaded+freetype254.lib - release build +freetype254d.lib - debug build +freetype254ST.lib - release build; single threaded +freetype254STd.lib - debug build; single threaded +freetype254MT.lib - release build; multi-threaded +freetype254MTd.lib - debug build; multi-threaded
Both Win32 and x64 builds are supported.
diff --git a/builds/windows/visualc/freetype.dsp b/builds/windows/visualc/freetype.dsp index c09afe54b..82aad3190 100644 --- a/builds/windows/visualc/freetype.dsp +++ b/builds/windows/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\freetype253.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254.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\freetype253_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254_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\freetype253_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype254_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_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\freetype253.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype254.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.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\freetype253.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype253ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype254ST.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\freetype253_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib" !ENDIF diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index 3baa3e21c..5754f2169 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -69,7 +69,7 @@ />- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP
diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp
index c09afe54b..82aad3190 100644
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/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\freetype253.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254.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\freetype253_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254_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\freetype253_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype254_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT_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\freetype253.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype254.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254MT.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\freetype253.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype253ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype254ST.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\freetype253_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype253ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype254_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype254ST_D.lib"
!ENDIF
diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj
index 78580b751..b2ec353b4 100644
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -87,7 +87,7 @@
/>
- freetype253.lib - release build; single threaded - freetype253_D.lib - debug build; single threaded - freetype253MT.lib - release build; multi-threaded - freetype253MT_D.lib - debug build; multi-threaded+ freetype254.lib - release build; single threaded + freetype254_D.lib - debug build; single threaded + freetype254MT.lib - release build; multi-threaded + freetype254MT_D.lib - debug build; multi-threaded
Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index da7fddeef..94420f095 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -47,14 +47,14 @@ CHANGES BETWEEN 2.5.3 and 2.5.4 - The `FT_Sfnt_Tag' enumeration values have been changed to uppercase, e.g. `FT_SFNT_HEAD'. The lowercase variants are deprecated. This is for orthogonality with all other - enumeration-like values in FreeType. + enumeration (and enumeration-like) values in FreeType. - `cmake' now supports builds of FreeType as an OS X framework and for iOS. - Improved project files for vc2010, introducing a property file. - - The documentation generator for the API reference have been + - The documentation generator for the API reference has been updated to produce better HTML code (with proper CSS). At the same time, the documentation got a better structure. diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 7446954fe..5564acf85 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.5.4 17.3.11 6.11.3 2.5.3 17.2.11 6.11.2 2.5.2 17.1.11 6.11.1 2.5.1 17.0.11 6.11.0 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 99a17c576..61aa722e3 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "March 2014" "FreeType 2.5.3" +.TH FREETYPE-CONFIG 1 "December 2014" "FreeType 2.5.4" . . .SH NAME diff --git a/include/freetype.h b/include/freetype.h index b24acdea4..efbd13ad8 100644 --- a/include/freetype.h +++ b/include/freetype.h @@ -3937,7 +3937,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 5 -#define FREETYPE_PATCH 3 +#define FREETYPE_PATCH 4 /*************************************************************************/