aboutsummaryrefslogtreecommitdiff
path: root/freetype/builds/win32/visualc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-06 10:14:25 +0000
committermarha <marha@users.sourceforge.net>2010-08-06 10:14:25 +0000
commit47ed6413ce8f2586b8d542dc46055e075a47022e (patch)
treeb814efb2655c444a4f63ac3cbb7d0cdf4bb3ef2f /freetype/builds/win32/visualc
parentc115795736eb99a8f2288a06c231b9386f4d011f (diff)
downloadvcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.gz
vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.bz2
vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.zip
Updated to freetype 2.4.1
Diffstat (limited to 'freetype/builds/win32/visualc')
-rw-r--r--freetype/builds/win32/visualc/freetype.dsp20
-rw-r--r--freetype/builds/win32/visualc/freetype.vcproj16
-rw-r--r--freetype/builds/win32/visualc/index.html10
3 files changed, 25 insertions, 21 deletions
diff --git a/freetype/builds/win32/visualc/freetype.dsp b/freetype/builds/win32/visualc/freetype.dsp
index 31046c752..86a8444da 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\freetype2312.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241.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\freetype2312_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241_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\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype241_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT_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\freetype2312.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype241.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT.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\freetype2312.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype241ST.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\freetype2312_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241ST_D.lib"
!ENDIF
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj
index 98fd29533..c144bfc36 100644
--- a/freetype/builds/win32/visualc/freetype.vcproj
+++ b/freetype/builds/win32/visualc/freetype.vcproj
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312.lib"
+ OutputFile="..\..\..\objs\freetype241.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312MT.lib"
+ OutputFile="..\..\..\objs\freetype241MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312ST.lib"
+ OutputFile="..\..\..\objs\freetype241ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312_D.lib"
+ OutputFile="..\..\..\objs\freetype241_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -364,7 +364,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312ST_D.lib"
+ OutputFile="..\..\..\objs\freetype241ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype2312MT_D.lib"
+ OutputFile="..\..\..\objs\freetype241MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1319,6 +1319,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\base\ftxf86.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftlcdfil.c"
>
</File>
diff --git a/freetype/builds/win32/visualc/index.html b/freetype/builds/win32/visualc/index.html
index eaf3a5c5b..c05044915 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.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