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

Bump ffmpeg and boost versions

This commit is contained in:
Thomas Goyne 2013-08-19 09:27:49 -07:00
parent b4c2349b88
commit 1f5b98b11d
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -43,7 +43,7 @@
ignore = dirty ignore = dirty
[submodule "deps/boost"] [submodule "deps/boost"]
path = deps/boost path = deps/boost
url = git://github.com/alexanderkjeldaas/boost-mirror.git url = https://github.com/boostorg/boost.git
ignore = dirty ignore = dirty
[submodule "deps/lua"] [submodule "deps/lua"]
path = deps/lua path = deps/lua

16
aegisub/build/boost/boost.vcxproj
View File

@ -32,6 +32,22 @@
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Target Name="CopyHeaders" BeforeTargets="ClCompile">
<!-- All this cruft is to work around that despite what the documentation
claims, %(RecursiveDir) matches everything from the first * (not even
**) until the last / -->
<ItemGroup>
<BoostLibraries Include="$([System.IO.Directory]::GetDirectories(&quot;$(BoostPath)\libs&quot;))" />
<BoostIncludeDirs Include="%(BoostLibraries.Identity)\include\boost;$(BoostPath)\libs\numeric\conversion\include\boost" />
<Headers Include="%(BoostIncludeDirs.Identity)\**\*.*" />
</ItemGroup>
<Copy
SourceFiles="@(Headers)"
DestinationFiles="@(Headers->'$(AegisubSourceBase)include\boost\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true"
/>
</Target>
<!-- Source files --> <!-- Source files -->
<ItemGroup> <ItemGroup>
<ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp" /> <ClCompile Include="$(BoostPath)\libs\regex\src\cpp_regex_traits.cpp" />

2
deps/boost vendored

@ -1 +1 @@
Subproject commit 1b626831ef9060f49b3197583e7f80445b19a862 Subproject commit dd8bda57e82b7f11e3cbcf8bb7949986f8c262ab

2
deps/ffmpeg vendored

@ -1 +1 @@
Subproject commit ee189701a6f7fec56570ee3728d5d80378cbadd3 Subproject commit 76d8d2388120910b46225299b3e10fb4dd18287f