diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-10 16:12:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-10 16:12:27 +0100 |
| commit | 82e62cfbf79bc8c19946d034a0d5e14ce4fabb44 (patch) | |
| tree | 16003af05805301a8a23d3ba0048e29eaf0fca73 /freetype/builds/win32/visualc | |
| parent | 7381bc7b9f63b2a6bf9ea9cbe04614adfc4b2369 (diff) | |
| parent | d783adea42f29bd7917929597ca1031b70587e1d (diff) | |
| download | vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.gz vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.bz2 vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.zip | |
Merge remote-tracking branch 'origin/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 268696760..d887dba4b 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\freetype246.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247.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\freetype246_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247_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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT_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\freetype246.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype247.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247MT.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\freetype246.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype246ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype247ST.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\freetype246_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype247_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype247ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index 8c54ba4bf..7086c1d19 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246.lib"
+ OutputFile="..\..\..\objs\freetype247.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246MT.lib"
+ OutputFile="..\..\..\objs\freetype247MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246ST.lib"
+ OutputFile="..\..\..\objs\freetype247ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246_D.lib"
+ OutputFile="..\..\..\objs\freetype247_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246ST_D.lib"
+ OutputFile="..\..\..\objs\freetype247ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype246MT_D.lib"
+ OutputFile="..\..\..\objs\freetype247MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/freetype/builds/win32/visualc/index.html b/freetype/builds/win32/visualc/index.html index 953686a20..f0b4603b9 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.6 sources:</p> +compiles the following libraries from the FreeType 2.4.7 sources:</p> <ul> <pre> - freetype246.lib - release build; single threaded - freetype246_D.lib - debug build; single threaded - freetype246MT.lib - release build; multi-threaded - freetype246MT_D.lib - debug build; multi-threaded</pre> + freetype247.lib - release build; single threaded + freetype247_D.lib - debug build; single threaded + freetype247MT.lib - release build; multi-threaded + freetype247MT_D.lib - debug build; multi-threaded</pre> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP |