Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12720 - larsbergstrom:ffmpeg_dependencies, r=metajack

Browse source 
Add ffmpeg file dependencies to the MSI

r? @metajack

Generated by using: `depends.exe /oc:out.txt servo.exe`

And then pulling out all the ones in the mingw tree into the MSI.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12720)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-04 00:22:58 -05:00 • committed by GitHub
commit 5909c4e7e5
1 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

32
support/windows/Servo.wxs.mako
View file

@ -113,13 +113,37 @@
Name="libfontconfig-1.dll" Name="libfontconfig-1.dll"
Source="C:\msys64\mingw64\bin\libfontconfig-1.dll" Source="C:\msys64\mingw64\bin\libfontconfig-1.dll"
DiskId="1"/> DiskId="1"/>
<File Id="AVUtil" <File Id="AVCodecDll"
Name="avcodec-57.dll"
Source="C:\msys64\mingw64\bin\avcodec-57.dll"
DiskId="1"/>
<File Id="AVDeviceDll"
Name="avdevice-57.dll"
Source="C:\msys64\mingw64\bin\avdevice-57.dll"
DiskId="1"/>
<File Id="AVFilterDll"
Name="avfilter-6.dll"
Source="C:\msys64\mingw64\bin\avfilter-6.dll"
DiskId="1"/>
<File Id="AVFormatDll"
Name="avformat-57.dll"
Source="c:\msys64\mingw64\bin\avformat-57.DLL"
DiskId="1"/>
<File Id="AVUtilDll"
Name="avutil-55.dll" Name="avutil-55.dll"
Source="C:\msys64\mingw64\bin\avutil-55.dll" Source="C:\msys64\mingw64\bin\avutil-55.dll"
DiskId="1"/> DiskId="1"/>
<File Id="AVFormat" <File Id="PostprocDll"
Name="avformat-57.dll" Name="postproc-54.dll"
Source="C:\msys64\mingw64\bin\avformat-57.dll" Source="c:\msys64\mingw64\bin\postproc-54.DLL"
DiskId="1"/>
<File Id="SWResampleDll"
Name="swresample-2.dll"
Source="c:\msys64\mingw64\bin\swresample-2.DLL"
DiskId="1"/>
<File Id="SWScaleDll"
Name="swscale-4.dll"
Source="c:\msys64\mingw64\bin\swscale-4.DLL"
DiskId="1"/> DiskId="1"/>
</Component> </Component>