diff options
author | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
commit | 4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch) | |
tree | 543c693b5dee03c965b0c9ef79869a8536024432 /freetype/builds/win32/visualc | |
parent | 1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff) | |
parent | 2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff) | |
download | vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2 vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/builds/win32/visualc')
-rw-r--r-- | freetype/builds/win32/visualc/freetype.dsp | 20 | ||||
-rw-r--r-- | freetype/builds/win32/visualc/freetype.vcproj | 12 | ||||
-rw-r--r-- | freetype/builds/win32/visualc/index.html | 10 |
3 files changed, 21 insertions, 21 deletions
diff --git a/freetype/builds/win32/visualc/freetype.dsp b/freetype/builds/win32/visualc/freetype.dsp index e09b1b882..acc97f238 100644 --- a/freetype/builds/win32/visualc/freetype.dsp +++ b/freetype/builds/win32/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\freetype242.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244.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\freetype242_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244_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\freetype242_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype244_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244MT_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\freetype242.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype244.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244MT.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\freetype242.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype242ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype244.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype244ST.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\freetype242_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype242ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype244_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index a1986b6ad..d59efa9a8 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype242MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/freetype/builds/win32/visualc/index.html b/freetype/builds/win32/visualc/index.html index 4181ee391..f2c22078d 100644 --- a/freetype/builds/win32/visualc/index.html +++ b/freetype/builds/win32/visualc/index.html @@ -11,14 +11,14 @@ <p>This directory contains project files for Visual C++, named <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>. It -compiles the following libraries from the FreeType 2.4.2 sources:</p> +compiles the following libraries from the FreeType 2.4.4 sources:</p> <ul> <pre> - freetype242.lib - release build; single threaded - freetype242_D.lib - debug build; single threaded - freetype242MT.lib - release build; multi-threaded - freetype242MT_D.lib - debug build; multi-threaded</pre> + freetype244.lib - release build; single threaded + freetype244_D.lib - debug build; single threaded + freetype244MT.lib - release build; multi-threaded + freetype244MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP |