From 1c4004bb345080fb5356402f30af83e648d0b503 Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Sun, 25 Nov 2018 23:19:39 -0500 Subject: [PATCH] [builds] Belated DLL support with vc2002-vc2008. The solution and project files should be automatically upgraded for the approriate Visual C++ version. * builds/windows/visualc/freetype.{sln,vcproj}: Major upgrades. * builds/windows/visualc/index.html: Document the change. * builds/windows/vc2005, builds/windows/vc2008: Removed as redundant. --- ChangeLog | 11 + builds/windows/vc2005/freetype.sln | 31 -- builds/windows/vc2005/freetype.vcproj | 232 -------- builds/windows/vc2005/index.html | 37 -- builds/windows/vc2008/freetype.sln | 31 -- builds/windows/vc2008/freetype.vcproj | 710 ------------------------- builds/windows/vc2008/index.html | 37 -- builds/windows/visualc/freetype.sln | 22 +- builds/windows/visualc/freetype.vcproj | 313 +++-------- builds/windows/visualc/index.html | 21 +- 10 files changed, 105 insertions(+), 1340 deletions(-) delete mode 100644 builds/windows/vc2005/freetype.sln delete mode 100644 builds/windows/vc2005/freetype.vcproj delete mode 100644 builds/windows/vc2005/index.html delete mode 100644 builds/windows/vc2008/freetype.sln delete mode 100644 builds/windows/vc2008/freetype.vcproj delete mode 100644 builds/windows/vc2008/index.html diff --git a/ChangeLog b/ChangeLog index 1680156df..04b4fbd3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2018-11-18 Alexei Podtelezhnikov + + [builds] Belated DLL support with vc2002-vc2008. + + The solution and project files should be automatically upgraded for + the approriate Visual C++ version. + + * builds/windows/visualc/freetype.{sln,vcproj}: Major upgrades. + * builds/windows/visualc/index.html: Document the change. + * builds/windows/vc2005, builds/windows/vc2008: Removed as redundant. + 2018-11-22 Armin Hasitzka * src/cff/cffparse.c: Please the compiler. diff --git a/builds/windows/vc2005/freetype.sln b/builds/windows/vc2005/freetype.sln deleted file mode 100644 index ec3345d18..000000000 --- a/builds/windows/vc2005/freetype.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - LIB Debug Multithreaded|Win32 = LIB Debug Multithreaded|Win32 - LIB Debug Singlethreaded|Win32 = LIB Debug Singlethreaded|Win32 - LIB Debug|Win32 = LIB Debug|Win32 - LIB Release Multithreaded|Win32 = LIB Release Multithreaded|Win32 - LIB Release Singlethreaded|Win32 = LIB Release Singlethreaded|Win32 - LIB Release|Win32 = LIB Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug|Win32.ActiveCfg = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug|Win32.Build.0 = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Win32.ActiveCfg = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/builds/windows/vc2005/freetype.vcproj b/builds/windows/vc2005/freetype.vcproj deleted file mode 100644 index a107b58c8..000000000 --- a/builds/windows/vc2005/freetype.vcproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/windows/vc2005/index.html b/builds/windows/vc2005/index.html deleted file mode 100644 index c5e182ef0..000000000 --- a/builds/windows/vc2005/index.html +++ /dev/null @@ -1,37 +0,0 @@ - -
- - FreeType 2 Project Files for VS.NET 2005 - - - -

- FreeType 2 Project Files for VS.NET 2005 -

- -

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.9.1 sources:

- -
    - 
    -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
    -
- -

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 .tar.*z archives, be sure to configure your extracting -tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider -using the unix2dos or u2d utilities that are floating -around, which specifically deal with this particular problem. - -

Build directories are placed in the top-level objs -directory.

- - - diff --git a/builds/windows/vc2008/freetype.sln b/builds/windows/vc2008/freetype.sln deleted file mode 100644 index 6c522f943..000000000 --- a/builds/windows/vc2008/freetype.sln +++ /dev/null @@ -1,31 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - LIB Debug Multithreaded|Win32 = LIB Debug Multithreaded|Win32 - LIB Debug Singlethreaded|Win32 = LIB Debug Singlethreaded|Win32 - LIB Debug|Win32 = LIB Debug|Win32 - LIB Release Multithreaded|Win32 = LIB Release Multithreaded|Win32 - LIB Release Singlethreaded|Win32 = LIB Release Singlethreaded|Win32 - LIB Release|Win32 = LIB Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug|Win32.ActiveCfg = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Debug|Win32.Build.0 = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Win32.ActiveCfg = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/builds/windows/vc2008/freetype.vcproj b/builds/windows/vc2008/freetype.vcproj deleted file mode 100644 index 28912064e..000000000 --- a/builds/windows/vc2008/freetype.vcproj +++ /dev/null @@ -1,710 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/builds/windows/vc2008/index.html b/builds/windows/vc2008/index.html deleted file mode 100644 index 25c6f9b13..000000000 --- a/builds/windows/vc2008/index.html +++ /dev/null @@ -1,37 +0,0 @@ - -
- - FreeType 2 Project Files for VS.NET 2008 - - - -

- FreeType 2 Project Files for VS.NET 2008 -

- -

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.9.1 sources:

- -
    - 
    -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
    -
- -

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 .tar.*z archives, be sure to configure your extracting -tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider -using the unix2dos or u2d utilities that are floating -around, which specifically deal with this particular problem. - -

Build directories are placed in the top-level objs -directory.

- - - diff --git a/builds/windows/visualc/freetype.sln b/builds/windows/visualc/freetype.sln index 1f64be282..9054d0abe 100644 --- a/builds/windows/visualc/freetype.sln +++ b/builds/windows/visualc/freetype.sln @@ -1,27 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 7.00 +# Visual C++ 2002-2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Multithreaded|Win32 = Debug Multithreaded|Win32 - Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32 + Debug Static|Win32 = Debug Static|Win32 Debug|Win32 = Debug|Win32 - Release Multithreaded|Win32 = Release Multithreaded|Win32 - Release Singlethreaded|Win32 = Release Singlethreaded|Win32 + Release Static|Win32 = Release Static|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.ActiveCfg = Debug Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.ActiveCfg = Debug Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|Win32.Build.0 = Debug Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.ActiveCfg = Release Singlethreaded|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.ActiveCfg = Release Static|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|Win32.Build.0 = Release Static|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/builds/windows/visualc/freetype.vcproj b/builds/windows/visualc/freetype.vcproj index abec8b927..385c93ea7 100644 --- a/builds/windows/visualc/freetype.vcproj +++ b/builds/windows/visualc/freetype.vcproj @@ -1,7 +1,6 @@ @@ -15,13 +14,12 @@ + @@ -84,19 +81,21 @@ + - - - - - - - - - - - - - - - - - + @@ -306,19 +225,21 @@ + - - - - - - - - - - - - - - - - - - - - - @@ -509,15 +345,7 @@ /> - - - - - - + + + + @@ -592,10 +420,22 @@ RelativePath="..\..\..\src\base\ftcid.c" > + + + + + + @@ -612,18 +452,6 @@ RelativePath="..\..\..\src\base\ftwinfnt.c" > - - - - - - @@ -703,6 +531,15 @@ > + + + + diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html index c0611d2f8..3a77f36a4 100644 --- a/builds/windows/visualc/index.html +++ b/builds/windows/visualc/index.html @@ -1,26 +1,27 @@
- FreeType 2 Project Files for Visual C++ and VS.NET 2005 + FreeType 2 Project Files for Visual C++ 6.0 and 2002-2008

- FreeType 2 Project Files for Visual C++ and VS.NET 2005 + FreeType 2 Project Files for Visual C++ 6.0 and 2002-2008

-

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.9.1 sources:

+

This directory contains project files freetype.dsp for +Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002 +through 2008, which you might need to upgrade automatically. +It compiles the following libraries from the FreeType 2.9.1 sources:

    - 
    -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
    +
  • freetype.dll using 'Release' or 'Debug' configurations
    • +
  • freetype.lib using 'Release Static' or 'Debug Static' configurations
+

Build directories and target files are placed in the top-level +objs directory.

+

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 .tar.*z archives, be sure to configure your extracting