Skip to content

Commit

Permalink
project: Update for 0.17.2 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Jun 8, 2024
1 parent a025816 commit 828cab0
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 36 deletions.
2 changes: 1 addition & 1 deletion SMP/SMP.patch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/libass/ass_compat.h b/libass/ass_compat.h
index 38df913..47433d8 100644
index 52ac282..852d801 100644
--- a/libass/ass_compat.h
+++ b/libass/ass_compat.h
@@ -24,6 +24,10 @@
Expand Down
20 changes: 10 additions & 10 deletions SMP/libass.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
Expand Down Expand Up @@ -60,7 +60,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
Expand Down Expand Up @@ -106,7 +106,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down Expand Up @@ -153,7 +153,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down Expand Up @@ -200,7 +200,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
Expand Down Expand Up @@ -246,7 +246,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
Expand Down Expand Up @@ -292,7 +292,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down Expand Up @@ -339,7 +339,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|Win32'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down Expand Up @@ -386,7 +386,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down Expand Up @@ -433,7 +433,7 @@ del /f /q $(OutDir)\licenses\libass.txt
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLStaticDeps|x64'">
<ClCompile>
<PreprocessorDefinitions>inline=_inline;_USE_MATH_DEFINES;LIBXML_STATIC;FRIBIDI_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.\;..\;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\;..\;..\libass;$(OutDir)\include\freetype2;$(OutDir)\include\harfbuzz;$(OutDir)\include\fribidi;$(ProjectDir)\..\..\prebuilt\include\freetype2;$(ProjectDir)\..\..\prebuilt\include\harfbuzz;$(ProjectDir)\..\..\prebuilt\include\fribidi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4244;4267;4018;4334;4101;4996;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
Expand Down
36 changes: 30 additions & 6 deletions SMP/libass.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
<Filter Include="Header Files\libass\x86">
<UniqueIdentifier>{cecd9ba8-49f4-46cf-94ac-bdb674aaea96}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\libass\c">
<UniqueIdentifier>{0701b920-c951-4302-9f50-8811ea828332}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\libass\c">
<UniqueIdentifier>{bb9dd42b-c44c-4216-87b4-686e5d755506}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="config.h">
Expand Down Expand Up @@ -72,9 +78,6 @@
<ClInclude Include="..\libass\ass_rasterizer.h">
<Filter>Header Files\libass</Filter>
</ClInclude>
<ClInclude Include="..\libass\ass_func_template.h">
<Filter>Header Files\libass</Filter>
</ClInclude>
<ClInclude Include="..\libass\ass_fontselect.h">
<Filter>Header Files\libass</Filter>
</ClInclude>
Expand Down Expand Up @@ -105,6 +108,15 @@
<ClInclude Include="..\libass\ass_filesystem.h">
<Filter>Header Files\libass</Filter>
</ClInclude>
<ClInclude Include="..\libass\ass_bitmap_engine.h">
<Filter>Header Files\libass</Filter>
</ClInclude>
<ClInclude Include="..\libass\c\blur_template.h">
<Filter>Header Files\libass\c</Filter>
</ClInclude>
<ClInclude Include="..\libass\c\rasterizer_template.h">
<Filter>Header Files\libass\c</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libass\ass_fontconfig.c">
Expand Down Expand Up @@ -146,9 +158,6 @@
<ClCompile Include="..\libass\ass_font.c">
<Filter>Source Files\libass</Filter>
</ClCompile>
<ClCompile Include="..\libass\ass_rasterizer_c.c">
<Filter>Source Files\libass</Filter>
</ClCompile>
<ClCompile Include="..\libass\ass_rasterizer.c">
<Filter>Source Files\libass</Filter>
</ClCompile>
Expand All @@ -170,6 +179,21 @@
<ClCompile Include="..\libass\ass_filesystem.c">
<Filter>Source Files\libass</Filter>
</ClCompile>
<ClCompile Include="..\libass\ass_bitmap_engine.c">
<Filter>Source Files\libass</Filter>
</ClCompile>
<ClCompile Include="..\libass\c\c_be_blur.c">
<Filter>Source Files\libass\c</Filter>
</ClCompile>
<ClCompile Include="..\libass\c\c_blend_bitmaps.c">
<Filter>Source Files\libass\c</Filter>
</ClCompile>
<ClCompile Include="..\libass\c\c_blur.c">
<Filter>Source Files\libass\c</Filter>
</ClCompile>
<ClCompile Include="..\libass\c\c_rasterizer.c">
<Filter>Source Files\libass\c</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="libass.def">
Expand Down
10 changes: 8 additions & 2 deletions SMP/libass_files.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ItemGroup>
<ClInclude Include="..\libass\ass.h" />
<ClInclude Include="..\libass\ass_bitmap.h" />
<ClInclude Include="..\libass\ass_bitmap_engine.h" />
<ClInclude Include="..\libass\ass_cache.h" />
<ClInclude Include="..\libass\ass_cache_template.h" />
<ClInclude Include="..\libass\ass_compat.h" />
Expand All @@ -13,7 +14,6 @@
<ClInclude Include="..\libass\ass_font.h" />
<ClInclude Include="..\libass\ass_fontconfig.h" />
<ClInclude Include="..\libass\ass_fontselect.h" />
<ClInclude Include="..\libass\ass_func_template.h" />
<ClInclude Include="..\libass\ass_library.h" />
<ClInclude Include="..\libass\ass_outline.h" />
<ClInclude Include="..\libass\ass_parse.h" />
Expand All @@ -27,11 +27,14 @@
<ClInclude Include="..\libass\dwrite_c.h" />
<ClInclude Include="..\libass\wyhash.h" />
<ClInclude Include="..\libass\x86\cpuid.h" />
<ClInclude Include="..\libass\c\blur_template.h" />
<ClInclude Include="..\libass\c\rasterizer_template.h" />
<ClInclude Include="config.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libass\ass.c" />
<ClCompile Include="..\libass\ass_bitmap.c" />
<ClCompile Include="..\libass\ass_bitmap_engine.c" />
<ClCompile Include="..\libass\ass_blur.c" />
<ClCompile Include="..\libass\ass_cache.c" />
<ClCompile Include="..\libass\ass_directwrite.c" />
Expand All @@ -44,13 +47,16 @@
<ClCompile Include="..\libass\ass_outline.c" />
<ClCompile Include="..\libass\ass_parse.c" />
<ClCompile Include="..\libass\ass_rasterizer.c" />
<ClCompile Include="..\libass\ass_rasterizer_c.c" />
<ClCompile Include="..\libass\ass_render.c" />
<ClCompile Include="..\libass\ass_render_api.c" />
<ClCompile Include="..\libass\ass_shaper.c" />
<ClCompile Include="..\libass\ass_string.c" />
<ClCompile Include="..\libass\ass_strtod.c" />
<ClCompile Include="..\libass\ass_utils.c" />
<ClCompile Include="..\libass\c\c_rasterizer.c" />
<ClCompile Include="..\libass\c\c_blend_bitmaps.c" />
<ClCompile Include="..\libass\c\c_be_blur.c" />
<ClCompile Include="..\libass\c\c_blur.c" />
</ItemGroup>
<ItemGroup>
<None Include="libass.def" />
Expand Down
Loading

0 comments on commit 828cab0

Please sign in to comment.