Update fontconfig

This commit is contained in:
Thomas Goyne 2014-03-14 06:56:19 -07:00
parent 21d87ff1ca
commit b7b8c3d251
3 changed files with 66 additions and 15 deletions

View file

@ -36,37 +36,49 @@
</InstallHeader> </InstallHeader>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccache.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fccache.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fchash.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fclang.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fclang.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fclist.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fclist.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcmatrix.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcmatrix.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcname.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcname.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c" /> <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c" />
<ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" /> <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h" />
<ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" /> <ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h" />
<ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h" /> <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h" /> <ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcint.h" /> <ClInclude Include="$(FontconfigSrcDir)\src\fcint.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h" />
<ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h" /> <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h" />
<ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h" />
<ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -38,9 +38,6 @@
<ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c"> <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c"> <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -83,14 +80,23 @@
<ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c"> <ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fchash.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(FontconfigSrcDir)\win32\headers\config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\win32\headers\dirent.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h"> <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -103,5 +109,38 @@
<ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h"> <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\win32\include\config.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcprivate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\fontconfig\fontconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcarch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcatomic.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcmutex.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcobjs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcobjshash.gperf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcwindows.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
vendor/fontconfig vendored

@ -1 +1 @@
Subproject commit b16b9f0b51fcb3a96dbf81898cc5b0fa98937f7f Subproject commit 6c22e896d4593e6f28ab2ab7f3c6b8f0b0df7857