Add fontconfig project

2012-11-02 07:06:56 -07:00 · 2012-11-02 07:06:56 -07:00 · 8af78a6a61
commit 8af78a6a61
parent 3add0e5b91
7 changed files with 244 additions and 0 deletions
--- a/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
+++ b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
@ -44,6 +44,7 @@
    <FFmpegSourceLibraryPath>$(AegisubSourceBase)libffms\lib\</FFmpegSourceLibraryPath>
    <FFmpegSourceLibraryName>ffms2.lib</FFmpegSourceLibraryName>
    <AegisubUseFreetype2>true</AegisubUseFreetype2>
+    <AegisubUseFontconfig>true</AegisubUseFontconfig>
    <AegisubUseFftw>false</AegisubUseFftw>
    <AegisubUseLibass>false</AegisubUseLibass>
    <AegisubUseCsri>HelperLibrary</AegisubUseCsri>
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@ -103,6 +103,13 @@
    </ClCompile>
  </ItemDefinitionGroup>

+  <!-- Fontconfig support -->
+  <ItemDefinitionGroup Condition="'$(AegisubUseFontconfig)'=='true'">
+    <ClCompile>
+      <PreprocessorDefinitions>WITH_FONTCONFIG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
  <!-- FFmpegSource support -->
  <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
    <ClCompile>
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@ -57,6 +57,8 @@

  <!-- External user files to check which are enabled -->
  <Import Project="..\fftw\fftw.vcxproj.user" />
+  <Import Project="..\freetype2\freetype.vcxproj.user" />
+  <Import Project="..\fontconfig\fontconfig.vcxproj.user" />

  <!-- Project References -->
  <ItemGroup>
@ -69,6 +71,9 @@
    <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="..\hunspell\hunspell.vcxproj">
      <Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
    </ProjectReference>
--- a/aegisub/build/Aegisub/Aegisub.xml
+++ b/aegisub/build/Aegisub/Aegisub.xml
@ -130,6 +130,13 @@
    Description="Specify whether to use the FFTW fourier transformation library to speed up audio spectrum rendering. You will need to configure the location of the FFTW library on the Library paths page."
    />

+  <BoolProperty
+    Name="AegisubUseFontconfig"
+    Category="Features"
+    DisplayName="Use Fontconfig"
+    Description="Specify whether to use Fontconfig for font enumeration in the Font Collector. You will need to configure the location of the Fontconfig library on the Library paths page."
+    />
+
  <BoolProperty
    Name="AegisubUseLibass"
    Category="Features"
--- a/aegisub/build/fontconfig/config.xml
+++ b/aegisub/build/fontconfig/config.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Rule Name="ExternalSourceLocation"
+    DisplayName="Source Location"
+    Order="1"
+    PageTemplate="tool"
+    xmlns="http://schemas.microsoft.com/build/2009/properties">
+
+  <Rule.DataSource>
+    <DataSource Persistence="UserFile" ItemType="" HasConfigurationCondition="false" />
+  </Rule.DataSource>
+
+  <StringProperty
+    Subtype="folder"
+    Name="FontconfigSrcDir"
+    DisplayName="Source Location"
+    Description="A directory containing a copy of Fontconfig, or empty to disable Fontconfig. Changes to this property do not take effect until the project is reloaded."
+    />
+</Rule>
--- a/aegisub/build/fontconfig/fontconfig.vcxproj
+++ b/aegisub/build/fontconfig/fontconfig.vcxproj
@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- VC boilerplate -->
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AD56899E-961B-47B7-BD0F-14D0DA50D141}</ProjectGuid>
+    <RootNamespace>fontconfig</RootNamespace>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+
+  <!-- Project configuration -->
+  <ItemGroup>
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)config.xml" />
+    <ProjectTools Include="ExternalSourceLocation" />
+  </ItemGroup>
+
+  <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;
+        $(AegisubSourceBase)\include;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>
+        HAVE_CONFIG_H;
+        %(PreprocessorDefinitions)
+      </PreprocessorDefinitions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>
+        md $(AegisubSourceBase)\include\fontconfig 2&gt; NUL
+        copy $(FontconfigSrcDir)\fontconfig\*.h $(AegisubSourceBase)\include\fontconfig
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+
+  <!-- Source files -->
+  <ItemGroup>
+    <ClCompile Include="$(FontconfigSrcDir)\win32\src\dirent.c" />
+    <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\fcdbg.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdefault.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcdir.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcformat.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcfreetype.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcfs.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\fcmatrix.c" />
+    <ClCompile Include="$(FontconfigSrcDir)\src\fcname.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" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\config.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\win32\headers\dirent.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcdeprecate.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcftint.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\fcint.h" />
+    <ClInclude Include="$(FontconfigSrcDir)\src\ftglue.h" />
+  </ItemGroup>
+</Project>
--- a/aegisub/build/fontconfig/fontconfig.vcxproj.filters
+++ b/aegisub/build/fontconfig/fontconfig.vcxproj.filters
@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.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\fcdir.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\fcmatrix.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>
+  </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">
+      <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>
+  </ItemGroup>
+</Project>