diff options
author | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
commit | 20ff8ddf2d9bb41050d10bbc75d61b9161880c7c (patch) | |
tree | 22566fcd9663b2baa565cd0c64eaa662d6ba03ee /freetype/builds/win32/vc2008 | |
parent | c29011f2831315d3da9c4727c1e626d80520b97a (diff) | |
parent | 6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff) | |
download | vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.gz vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.bz2 vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.zip |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/builds/win32/vc2008')
-rw-r--r-- | freetype/builds/win32/vc2008/freetype.vcproj | 16 | ||||
-rw-r--r-- | freetype/builds/win32/vc2008/index.html | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/freetype/builds/win32/vc2008/freetype.vcproj b/freetype/builds/win32/vc2008/freetype.vcproj index 57d0bd3f5..d5a6577b7 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\freetype2312.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2312_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT_D.lib"
+ OutputFile="..\..\..\objs\win32\vc2008\freetype241MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1320,6 +1320,10 @@ >
</File>
<File
+ RelativePath="..\..\..\src\base\ftxf86.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftlcdfil.c"
>
</File>
diff --git a/freetype/builds/win32/vc2008/index.html b/freetype/builds/win32/vc2008/index.html index aa16c384c..54dcbe488 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.12 sources:</p> +compiles the following libraries from the FreeType 2.4.1 sources:</p> <ul> <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> + freetype241.lib - release build; single threaded + freetype241_D.lib - debug build; single threaded + freetype241MT.lib - release build; multi-threaded + freetype241MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP |