diff options
author | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-12 09:53:17 +0000 |
commit | 29b86f9852b2b7ecc31cdfee56679537e40bc6e2 (patch) | |
tree | 1e6ec8ccf2dbf773260a1953b8e13c49f9b7c5f5 /freetype/builds/win32/vc2008 | |
parent | 529236591df7366479a6fac30b387667678fd1ba (diff) | |
download | vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.gz vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.tar.bz2 vcxsrv-29b86f9852b2b7ecc31cdfee56679537e40bc6e2.zip |
svn merge -r524:HEAD "^/branches/released" .
Diffstat (limited to 'freetype/builds/win32/vc2008')
-rw-r--r-- | freetype/builds/win32/vc2008/freetype.vcproj | 28 | ||||
-rw-r--r-- | freetype/builds/win32/vc2008/index.html | 10 |
2 files changed, 27 insertions, 11 deletions
diff --git a/freetype/builds/win32/vc2008/freetype.vcproj b/freetype/builds/win32/vc2008/freetype.vcproj index 16ae98666..57d0bd3f5 100644 --- a/freetype/builds/win32/vc2008/freetype.vcproj +++ b/freetype/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311MT.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311ST.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311ST_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2311MT_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1320,6 +1320,22 @@ >
</File>
<File
+ RelativePath="..\..\..\src\base\ftlcdfil.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\base\ftgxval.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\base\ftotval.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\base\ftpatent.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\pcf\pcf.c"
>
<FileConfiguration
diff --git a/freetype/builds/win32/vc2008/index.html b/freetype/builds/win32/vc2008/index.html index 4157d25d2..aa16c384c 100644 --- a/freetype/builds/win32/vc2008/index.html +++ b/freetype/builds/win32/vc2008/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.3.11 sources:</p> +compiles the following libraries from the FreeType 2.3.12 sources:</p> <ul> <pre> - freetype2311.lib - release build; single threaded - freetype2311_D.lib - debug build; single threaded - freetype2311MT.lib - release build; multi-threaded - freetype2311MT_D.lib - debug build; multi-threaded</pre> + freetype2312.lib - release build; single threaded + freetype2312_D.lib - debug build; single threaded + freetype2312MT.lib - release build; multi-threaded + freetype2312MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP |