mirror of https://github.com/odrling/Aegisub
Update libass
Worth noting that this does NOT currently build, thanks to a few lines in libass that are not compatible with vc++. I'll bump the libass commit when MrSmile's pr gets merged and this is remedied. You can apply this commit to remedy that: 5317a8dd89
Also worth noting that while libass switched to nasm, I haven't done so here because it wasn't worth the effort, so I just made a questionable change to the yasm.targets to emulate nasm behavior
This commit is contained in:
Ryan Lucia
parent
7147038e0a
commit
7853e7abe2
|
|
@ -29,6 +29,7 @@
|
|||
<PreprocessorDefinitions>
|
||||
inline=__inline;
|
||||
FRIBIDI_ENTRY=;
|
||||
_USE_MATH_DEFINES=;
|
||||
%(PreprocessorDefinitions)
|
||||
</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
|
|
@ -37,8 +38,8 @@
|
|||
<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>
|
||||
<Config Condition="'$(Platform)'=='Win32'">%(Config) -DARCH_X86_64=0 -DPREFIX -DHAVE_ALIGNED_STACK=0 -DHAVE_CPUNOP=1</Config>
|
||||
<Config Condition="'$(Platform)'=='x64'">%(Config) -DARCH_X86_64=1 -DHAVE_ALIGNED_STACK=1 -DHAVE_CPUNOP=1</Config>
|
||||
</Yasm>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
|
|
@ -54,39 +55,47 @@
|
|||
<Yasm Include="$(LibassSrcDir)\libass\x86\blend_bitmaps.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\blur.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\cpuid.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\gaussian.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\rasterizer.asm" />
|
||||
<None Include="$(LibassSrcDir)\libass\x86\x86inc.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\utils.asm" />
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\x86inc.asm" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_bitmap.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_cache.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_cache_template.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_compat.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_directwrite.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_drawing.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_font.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_fontselect.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_func_template.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_library.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_outline.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_parse.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_rasterizer.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_render.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_shaper.h" />
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_string.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\dwrite_c.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" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_bitmap.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_blur.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_cache.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_directwrite.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_drawing.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_font.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_fontselect.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_library.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_outline.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_parse.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer.c" />
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_rasterizer_c.c" />
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
<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>
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\be_blur.asm">
|
||||
|
|
@ -31,24 +27,21 @@
|
|||
<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">
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\gaussian.asm">
|
||||
<Filter>Assembly Files</Filter>
|
||||
</ClInclude>
|
||||
<None Include="$(LibassSrcDir)\libass\x86\x86inc.asm">
|
||||
</Yasm>
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\rasterizer.asm">
|
||||
<Filter>Assembly Files</Filter>
|
||||
</None>
|
||||
</Yasm>
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\utils.asm">
|
||||
<Filter>Assembly Files</Filter>
|
||||
</Yasm>
|
||||
<Yasm Include="$(LibassSrcDir)\libass\x86\x86inc.asm">
|
||||
<Filter>Assembly Files</Filter>
|
||||
</Yasm>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass.h">
|
||||
|
|
@ -63,39 +56,60 @@
|
|||
<ClInclude Include="$(LibassSrcDir)\libass\ass_cache_template.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_compat.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_directwrite.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_drawing.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_font.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_fontselect.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_func_template.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_library.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_outline.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_parse.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_rasterizer.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_render.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_shaper.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_string.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_types.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\ass_utils.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(LibassSrcDir)\libass\dwrite_c.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)config.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)strings.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="$(MSBuildThisFileDirectory)unistd.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass.c">
|
||||
|
|
@ -110,6 +124,9 @@
|
|||
<ClCompile Include="$(LibassSrcDir)\libass\ass_cache.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_directwrite.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_drawing.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -122,6 +139,9 @@
|
|||
<ClCompile Include="$(LibassSrcDir)\libass\ass_library.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_outline.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="$(LibassSrcDir)\libass\ass_parse.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
>
|
||||
<ItemGroup>
|
||||
<_Yasm>
|
||||
<Include>%(Include) -I%(RootDir)%(Directory)</Include>
|
||||
<Include>%(Include) -I%(RootDir)%(Directory)..\</Include>
|
||||
<OutputDir Condition="'%(OutputDir)' == '.\'"></OutputDir>
|
||||
<RelativeOutputDir>%(OutputDir)</RelativeOutputDir>
|
||||
<OutputDir>$(AegisubObjectDir)%(OutputDir)</OutputDir>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit cfa1a61e39f218fe4dc288ddf44b85200ff35fdd
|
||||
Subproject commit 98727c3b78f44cb3bbc955fcf5d977ebd911d5ca
|
||||
Loading…
Reference in New Issue