Update in-tree freetype2 lib (unused) to 2.9.1

2 files changed, 17 insertions, 446 deletions

diff --git a/modules/freetype2/builds/windows/vc2005/freetype.vcproj b/modules/freetype2/builds/windows/vc2005/freetype.vcproj
index b643840c2..b1e2ae681 100644
--- a/modules/freetype2/builds/windows/vc2005/freetype.vcproj
+++ b/modules/freetype2/builds/windows/vc2005/freetype.vcproj
@@ -16,7 +16,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype271.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291.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\freetype271MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT.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\freetype271ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST.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\freetype271_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291_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\freetype271ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291ST_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\freetype271MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype291MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -116,105 +116,18 @@
       <File RelativePath="..\..\..\src\autofit\autofit.c">

       </File>

       <File RelativePath="..\..\..\src\bdf\bdf.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\cff\cff.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\base\ftbase.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\base\ftbitmap.c">

       </File>

       <File RelativePath="..\..\..\src\cache\ftcache.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\ftdebug.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" DisableLanguageExtensions="false" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" DisableLanguageExtensions="false" />

+        <FileConfiguration>

+          <Tool Name="VCCLCompilerTool" DisableLanguageExtensions="false" />

         </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\base\ftfstype.c">

@@ -222,151 +135,27 @@
       <File RelativePath="..\..\..\src\base\ftgasp.c">

       </File>

       <File RelativePath="..\..\..\src\base\ftglyph.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\gzip\ftgzip.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\base\ftinit.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\lzw\ftlzw.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\base\ftstroke.c">

       </File>

       <File RelativePath="..\..\..\src\base\ftsystem.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <File RelativePath="..\..\..\src\smooth\smooth.c">

-        <FileConfiguration Name="Release|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Release Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Singlethreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

-        <FileConfiguration Name="Debug Multithreaded|Win32">

-          <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-        </FileConfiguration>

       </File>

       <Filter Name="FT_MODULES">

+        <File RelativePath="..\..\..\src\base\ftbdf.c">

+        </File>

         <File RelativePath="..\..\..\src\base\ftbbox.c">

         </File>

-        <File RelativePath="..\..\..\src\base\ftfntfmt.c">

+        <File RelativePath="..\..\..\src\base\ftcid.c">

         </File>

         <File RelativePath="..\..\..\src\base\ftmm.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\base\ftpfr.c">

         </File>

@@ -376,8 +165,6 @@
         </File>

         <File RelativePath="..\..\..\src\base\ftwinfnt.c">

         </File>

-        <File RelativePath="..\..\..\src\base\ftlcdfil.c">

-        </File>

         <File RelativePath="..\..\..\src\base\ftgxval.c">

         </File>

         <File RelativePath="..\..\..\src\base\ftotval.c">

@@ -385,244 +172,28 @@
         <File RelativePath="..\..\..\src\base\ftpatent.c">

         </File>

         <File RelativePath="..\..\..\src\pcf\pcf.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\pfr\pfr.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\psaux\psaux.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\pshinter\pshinter.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\psnames\psmodule.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\raster\raster.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\sfnt\sfnt.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\truetype\truetype.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\type1\type1.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\cid\type1cid.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\type42\type42.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

         <File RelativePath="..\..\..\src\winfonts\winfnt.c">

-          <FileConfiguration Name="Release|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Release Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Singlethreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

-          <FileConfiguration Name="Debug Multithreaded|Win32">

-            <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" BasicRuntimeChecks="3" />

-          </FileConfiguration>

         </File>

       </Filter>

     </Filter>

@@ -643,4 +214,4 @@
   </Files>

   <Globals>

   </Globals>

-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>

diff --git a/modules/freetype2/builds/windows/vc2005/index.html b/modules/freetype2/builds/windows/vc2005/index.html
index c3a5ab7d5..c5e182ef0 100644
--- a/modules/freetype2/builds/windows/vc2005/index.html
+++ b/modules/freetype2/builds/windows/vc2005/index.html
@@ -11,14 +11,14 @@
 
 <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.7.1 sources:</p>
+compiles the following libraries from the FreeType 2.9.1 sources:</p>
 
 <ul>
   <pre>
-    freetype271.lib     - release build; single threaded
-    freetype271_D.lib   - debug build;   single threaded
-    freetype271MT.lib   - release build; multi-threaded
-    freetype271MT_D.lib - debug build;   multi-threaded</pre>
+    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</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP