mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix statically linking fribidi

Browse source
This commit is contained in:
Thomas Goyne 2012-11-17 16:22:18 -08:00
parent 4a749530f4
commit 38efa5679e
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/build/Aegisub/Aegisub.targets
View file

@ -89,6 +89,9 @@
<ClCompile>
<PreprocessorDefinitions>WITH_LIBASS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>fribidi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<!-- Freetype 2 support -->
@ -176,9 +179,9 @@
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Link>
<AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<!-- Add property pages -->

3
aegisub/build/Aegisub/Aegisub.vcxproj
View file

@ -68,6 +68,9 @@
<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>
<ProjectReference Include="..\hunspell\hunspell.vcxproj">
<Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
</ProjectReference>

7
aegisub/build/fribidi/fribidi.vcxproj
View file

@ -32,14 +32,15 @@
</ImportGroup>
<PropertyGroup Label="ConfigArgs">
<CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug CFLAGS=-MDd</CfgDebug>
<CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug CFLAGS=-MD</CfgDebug>
<Cflags>-nologo -DFRIBIDI_ENTRY=\"\"</Cflags>
<CfgDebug Condition="'$(Configuration)' == 'Debug'">--enable-debug CFLAGS="-MDd $(Cflags)"</CfgDebug>
<CfgDebug Condition="'$(Configuration)' == 'Release'">--disable-debug CFLAGS="-MD $(Cflags)"</CfgDebug>
<CfgArgs>
--enable-static
--disable-shared
--disable-dependency-tracking
--without-glib
$(CfgEnableDebug)
$(CfgDebug)
</CfgArgs>
<AbsSrcDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)$(FribidiSrcDir)'))</AbsSrcDir>
</PropertyGroup>

1
aegisub/build/libass/libass.vcxproj
View file

@ -45,6 +45,7 @@
</AdditionalIncludeDirectories>
<PreprocessorDefinitions>
inline=__inline;
FRIBIDI_ENTRY=;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>