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

Enable assembly routines for libass on Windows

This commit is contained in:
Niels Martin Hansen 2015-01-20 01:08:44 +01:00
parent bfa416c583
commit 0f618d94df
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/libass/config.h
View File

@ -2,5 +2,6 @@
#define _CRT_NONSTDC_NO_DEPRECATE
#define CONFIG_FONTCONFIG 1
#define CONFIG_ASM 1
#define M_PI 3.1415926535897932384626433832795

20
build/libass/libass.vcxproj
View File

@ -13,6 +13,9 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
</ImportGroup>
<ImportGroup Label="Targets">
<Import Project="$(MSBuildThisFileDirectory)..\yasm.targets" />
</ImportGroup>
<!-- Project specific configuration -->
<ItemDefinitionGroup>
@ -33,6 +36,10 @@
<HeaderRoot>$(LibassSrcDir)\libass</HeaderRoot>
<Destination>ass\</Destination>
</InstallHeader>
<Yasm>
<Config Condition="'$(Platform)'=='Win32'">%(Config) -DARCH_X86_64=0 -DPREFIX -DHAVE_ALIGNED_STACK=0</Config>
<Config Condition="'$(Platform)'=='x64'">%(Config) -DARCH_X86_64=1 -DHAVE_ALIGNED_STACK=1</Config>
</Yasm>
</ItemDefinitionGroup>
<!-- Source files -->
@ -40,6 +47,15 @@
<InstallHeader Include="$(LibassSrcDir)\libass\ass.h" />
<InstallHeader Include="$(LibassSrcDir)\libass\ass_types.h" />
</ItemGroup>
<ItemGroup>
<Yasm Include="$(LibassSrcDir)\libass\x86\be_blur.asm">
<ExcludeFromBuild Condition="'$(Platform)'!='x64'">true</ExcludeFromBuild>
</Yasm>
<Yasm Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.asm" />
<Yasm Include="$(LibassSrcDir)\libass\x86\cpuid.asm" />
<Yasm Include="$(LibassSrcDir)\libass\x86\rasterizer.asm" />
<None Include="$(LibassSrcDir)\libass\x86\x86inc.asm" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(LibassSrcDir)\libass\ass.h" />
<ClInclude Include="$(LibassSrcDir)\libass\ass_bitmap.h" />
@ -54,6 +70,10 @@
<ClInclude Include="$(LibassSrcDir)\libass\ass_shaper.h" />
<ClInclude Include="$(LibassSrcDir)\libass\ass_types.h" />
<ClInclude Include="$(LibassSrcDir)\libass\ass_utils.h" />
<ClInclude Include="$(LibassSrcDir)\libass\x86\be_blur.h" />
<ClInclude Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.h" />
<ClInclude Include="$(LibassSrcDir)\libass\x86\cpuid.h" />
<ClInclude Include="$(LibassSrcDir)\libass\x86\rasterizer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)config.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)strings.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)unistd.h" />

35
build/libass/libass.vcxproj.filters
View File

@ -3,17 +3,50 @@
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Assembly Files">
<UniqueIdentifier>{56793734-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>asm</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="$(LibassSrcDir)\libass\x86\x86inc.h">
<Filter>Assembly Files</Filter>
</None>
<Yasm Include="$(LibassSrcDir)\libass\x86\be_blur.asm">
<Filter>Assembly Files</Filter>
</Yasm>
<Yasm Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.asm">
<Filter>Assembly Files</Filter>
</Yasm>
<Yasm Include="$(LibassSrcDir)\libass\x86\cpuid.asm">
<Filter>Assembly Files</Filter>
</Yasm>
<Yasm Include="$(LibassSrcDir)\libass\x86\rasterizer.asm">
<Filter>Assembly Files</Filter>
</Yasm>
<ClInclude Include="$(LibassSrcDir)\libass\x86\be_blur.h">
<Filter>Assembly Files</Filter>
</ClInclude>
<ClInclude Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.h">
<Filter>Assembly Files</Filter>
</ClInclude>
<ClInclude Include="$(LibassSrcDir)\libass\x86\cpuid.h">
<Filter>Assembly Files</Filter>
</ClInclude>
<ClInclude Include="$(LibassSrcDir)\libass\x86\rasterizer.h">
<Filter>Assembly Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(LibassSrcDir)\libass\ass.h">
<Filter>Header Files</Filter>