diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
| commit | 9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (patch) | |
| tree | 276b55ded8f63c6bc5041785785ba927f168e077 /freetype/builds/win32/visualc | |
| parent | c7b24c70d1e2d558d512665ffa5479e64b36692d (diff) | |
| parent | 6eaea4464631b5d8c1f44a46016163e351028afc (diff) | |
| download | vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.gz vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.bz2 vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/configure.ac
libXfont/doc/fontlib.xml
libXfont/src/bitmap/bitscale.c
libXfont/src/fontfile/decompress.c
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 a2d3ac877..268696760 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\freetype245.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246.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\freetype245_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246_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\freetype245_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype246_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT_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\freetype245.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype246.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246MT.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\freetype245.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype245ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype246ST.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\freetype245_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype245ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype246_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype246ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index eb585dd11..8c54ba4bf 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245.lib"
+ OutputFile="..\..\..\objs\freetype246.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245MT.lib"
+ OutputFile="..\..\..\objs\freetype246MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245ST.lib"
+ OutputFile="..\..\..\objs\freetype246ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245_D.lib"
+ OutputFile="..\..\..\objs\freetype246_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245ST_D.lib"
+ OutputFile="..\..\..\objs\freetype246ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245MT_D.lib"
+ OutputFile="..\..\..\objs\freetype246MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
diff --git a/freetype/builds/win32/visualc/index.html b/freetype/builds/win32/visualc/index.html index b7e5a191a..953686a20 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.5 sources:</p> +compiles the following libraries from the FreeType 2.4.6 sources:</p> <ul> <pre> - freetype245.lib - release build; single threaded - freetype245_D.lib - debug build; single threaded - freetype245MT.lib - release build; multi-threaded - freetype245MT_D.lib - debug build; multi-threaded</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> </ul> <p>Be sure to extract the files with the Windows (CR+LF) line endings. ZIP |