From fe2925408cdd5c1600a50acad1b4477aca8c5b2e Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Mon, 28 Dec 2015 19:57:46 -0800
Subject: [PATCH] Remove fontconfig entirely from the Windows build

---
 Aegisub.sln                                 |   5 -
 build/Aegisub/Aegisub.vcxproj               |   3 -
 build/DefaultConfiguration.props            |   1 -
 build/fontconfig/fontconfig.vcxproj         |  91 -------------
 build/fontconfig/fontconfig.vcxproj.filters | 143 --------------------
 vendor/fontconfig                           |   1 -
 6 files changed, 244 deletions(-)
 delete mode 100644 build/fontconfig/fontconfig.vcxproj
 delete mode 100644 build/fontconfig/fontconfig.vcxproj.filters
 delete mode 160000 vendor/fontconfig

diff --git a/Aegisub.sln b/Aegisub.sln
index fe3e67645..c8bdcada0 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -52,11 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "build\freetype2
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
 	EndProjectSection
 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}"
 	ProjectSection(ProjectDependencies) = postProject
 		{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
diff --git a/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj
index efd4a71ea..9d5ae17af 100644
--- a/build/Aegisub/Aegisub.vcxproj
+++ b/build/Aegisub/Aegisub.vcxproj
@@ -54,9 +54,6 @@
     <ProjectReference Include="..\freetype2\freetype.vcxproj" Condition="Exists('$(Freetype2SrcDir)')">
       <Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\fontconfig\fontconfig.vcxproj" Condition="Exists('$(FontconfigSrcDir)')">
-      <Project>{ad56899e-961b-47b7-bd0f-14d0da50d141}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\fribidi\fribidi.vcxproj">
       <Project>{fb8e8d19-a4d6-4181-943c-282075f49b41}</Project>
     </ProjectReference>
diff --git a/build/DefaultConfiguration.props b/build/DefaultConfiguration.props
index 6dc7f1852..785021381 100644
--- a/build/DefaultConfiguration.props
+++ b/build/DefaultConfiguration.props
@@ -55,7 +55,6 @@
     <FftwSrcDir>..\..\vendor\fftw</FftwSrcDir>
     <Freetype2SrcDir>..\..\vendor\freetype2</Freetype2SrcDir>
     <FribidiSrcDir>..\..\vendor\fribidi</FribidiSrcDir>
-    <FontconfigSrcDir>..\..\vendor\fontconfig</FontconfigSrcDir>
     <GtestSrcDir>..\..\vendor\googletest</GtestSrcDir>
     <IcuSrcDir>..\..\vendor\icu\source</IcuSrcDir>
     <LibassSrcDir>..\..\vendor\libass</LibassSrcDir>
diff --git a/build/fontconfig/fontconfig.vcxproj b/build/fontconfig/fontconfig.vcxproj
deleted file mode 100644
index 6368090bc..000000000
--- a/build/fontconfig/fontconfig.vcxproj
+++ /dev/null
@@ -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>
diff --git a/build/fontconfig/fontconfig.vcxproj.filters b/build/fontconfig/fontconfig.vcxproj.filters
deleted file mode 100644
index 3f5aecf85..000000000
--- a/build/fontconfig/fontconfig.vcxproj.filters
+++ /dev/null
@@ -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>
diff --git a/vendor/fontconfig b/vendor/fontconfig
deleted file mode 160000
index fbc5c4d89..000000000
--- a/vendor/fontconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbc5c4d89553e9d058e6ff06f61c03bfeb596e01