Module Name: xsrc
Committed By: mrg
Date: Thu Feb 24 05:42:26 UTC 2011
Modified Files:
xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.vcproj
xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp
freetype.vcproj index.html
Log Message:
merge freetype 2.4.4
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj \
xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.4
--- xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.3 Mon Nov 22 08:38:52 2010
+++ xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj Thu Feb 24 05:42:25 2011
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -144,7 +144,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -291,7 +291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -364,7 +364,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -438,7 +438,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.4
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.3 Mon Nov 22 08:38:52 2010
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp Thu Feb 24 05:42:25 2011
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug"
@@ -78,7 +78,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244_D.lib"
!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded"
@@ -102,8 +102,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype243_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT_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 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype243.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT.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 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype243ST.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 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype244_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype244ST_D.lib"
!ENDIF
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.4
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj:1.3 Mon Nov 22 08:38:53 2010
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj Thu Feb 24 05:42:25 2011
@@ -87,7 +87,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -162,7 +162,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -237,7 +237,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -309,7 +309,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -382,7 +382,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -456,7 +456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -534,7 +534,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -619,7 +619,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -704,7 +704,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -785,7 +785,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -867,7 +867,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -950,7 +950,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1036,7 +1036,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1121,7 +1121,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1206,7 +1206,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1287,7 +1287,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1369,7 +1369,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1452,7 +1452,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1538,7 +1538,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1623,7 +1623,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1708,7 +1708,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -1789,7 +1789,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1871,7 +1871,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -1954,7 +1954,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2040,7 +2040,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2125,7 +2125,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2210,7 +2210,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2291,7 +2291,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2373,7 +2373,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2456,7 +2456,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2542,7 +2542,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2627,7 +2627,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2712,7 +2712,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -2793,7 +2793,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2875,7 +2875,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -2958,7 +2958,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3044,7 +3044,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243.lib"
+ OutputFile="..\..\..\objs\freetype244.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3129,7 +3129,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT.lib"
+ OutputFile="..\..\..\objs\freetype244MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3214,7 +3214,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST.lib"
+ OutputFile="..\..\..\objs\freetype244ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -3295,7 +3295,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243_D.lib"
+ OutputFile="..\..\..\objs\freetype244_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3377,7 +3377,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243ST_D.lib"
+ OutputFile="..\..\..\objs\freetype244ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -3460,7 +3460,7 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype243MT_D.lib"
+ OutputFile="..\..\..\objs\freetype244MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html
diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.4
--- xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html:1.3 Mon Nov 22 08:38:53 2010
+++ xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html Thu Feb 24 05:42:25 2011
@@ -21,14 +21,14 @@
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.4.3 sources:</p>
+It compiles the following libraries from the FreeType 2.4.4 sources:</p>
<ul>
<pre>
- freetype243.lib - release build; single threaded
- freetype243_D.lib - debug build; single threaded
- freetype243MT.lib - release build; multi-threaded
- freetype243MT_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
