iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove fontconfig entirely from the Windows build

This commit is contained in:
Thomas Goyne 2015-12-28 19:57:46 -08:00
parent e5a6abd215
commit fe2925408c
6 changed files with 0 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Aegisub.sln
View File

@ -52,11 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "build\freetype2
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6} {914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "build\fontconfig\fontconfig.vcxproj", "{AD56899E-961B-47B7-BD0F-14D0DA50D141}"
ProjectSection(ProjectDependencies) = postProject
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6} {914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}

3
build/Aegisub/Aegisub.vcxproj
View File

@ -54,9 +54,6 @@
<ProjectReference Include="..\freetype2\freetype.vcxproj" Condition="Exists('$(Freetype2SrcDir)')"> <ProjectReference Include="..\freetype2\freetype.vcxproj" Condition="Exists('$(Freetype2SrcDir)')">
<Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project> <Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\fontconfig\fontconfig.vcxproj" Condition="Exists('$(FontconfigSrcDir)')">
<Project>{ad56899e-961b-47b7-bd0f-14d0da50d141}</Project>
</ProjectReference>
<ProjectReference Include="..\fribidi\fribidi.vcxproj"> <ProjectReference Include="..\fribidi\fribidi.vcxproj">
<Project>{fb8e8d19-a4d6-4181-943c-282075f49b41}</Project> <Project>{fb8e8d19-a4d6-4181-943c-282075f49b41}</Project>
</ProjectReference> </ProjectReference>

1
build/DefaultConfiguration.props
View File

@ -55,7 +55,6 @@
<FftwSrcDir>..\..\vendor\fftw</FftwSrcDir> <FftwSrcDir>..\..\vendor\fftw</FftwSrcDir>
<Freetype2SrcDir>..\..\vendor\freetype2</Freetype2SrcDir> <Freetype2SrcDir>..\..\vendor\freetype2</Freetype2SrcDir>
<FribidiSrcDir>..\..\vendor\fribidi</FribidiSrcDir> <FribidiSrcDir>..\..\vendor\fribidi</FribidiSrcDir>
<FontconfigSrcDir>..\..\vendor\fontconfig</FontconfigSrcDir>
<GtestSrcDir>..\..\vendor\googletest</GtestSrcDir> <GtestSrcDir>..\..\vendor\googletest</GtestSrcDir>
<IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir> <IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
<LibassSrcDir>..\..\vendor\libass</LibassSrcDir> <LibassSrcDir>..\..\vendor\libass</LibassSrcDir>

91
build/fontconfig/fontconfig.vcxproj
View File

@ -1,91 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{AD56899E-961B-47B7-BD0F-14D0DA50D141}</ProjectGuid>
<RootNamespace>fontconfig</RootNamespace>
</PropertyGroup>
<!-- Project configuration -->
<PropertyGroup Label="AegisubConfiguration">
<AegisubProjectType>lib</AegisubProjectType>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<!-- Project specific configuration -->
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>
$(FontconfigSrcDir);
$(FontconfigSrcDir)\win32\include;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
HAVE_CONFIG_H;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
<InstallHeader>
<HeaderRoot>$(FontconfigSrcDir)</HeaderRoot>
</InstallHeader>
</ItemDefinitionGroup>
<!-- Project References -->
<ItemGroup>
<ProjectReference Include="..\freetype2\freetype.vcxproj">
<Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
</ProjectReference>
</ItemGroup>
<!-- Source files -->
<ItemGroup>
<InstallHeader Include="$(FontconfigSrcDir)\fontconfig\*.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccache.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fccompat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcdir.cpp" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fchash.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fclang.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fclist.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcname.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcobjs.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcstat.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c" />
<ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c" />
<ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(FontconfigSrcDir)\fontconfig\fcfreetype.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\fcftint.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)\win32\include\config.h" />
<ClInclude Include="$(FontconfigSrcDir)\win32\include\dirent.h" />
</ItemGroup>
</Project>

143
build/fontconfig/fontconfig.vcxproj.filters
View File

@ -1,143 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{b4c15893-ec11-491d-9507-0ac184f9cc78}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\FT_MODULES">
<UniqueIdentifier>{4d3e4eff-3fbc-4b20-b413-2743b23b7109}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{e6cf6a0f-0404-4024-8bf8-ff5b29f35657}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcatomic.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcblanks.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fccache.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fccfg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fccharset.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcdbg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcfs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcinit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fclang.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fclist.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcmatch.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcname.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcpat.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcserialize.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcstr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\fcxml.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(FontconfigSrcDir)\src\ftglue.c">
<Filter>Source Files</Filter>
</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>
<ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\fcint.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h">
<Filter>Header Files</Filter>
</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>
</Project>

1
vendor/fontconfig vendored

@ -1 +0,0 @@
Subproject commit fbc5c4d89553e9d058e6ff06f61c03bfeb596e01