mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Link with ffmpeg

Browse source
This commit is contained in:
Cheng Zhao 2016-02-17 22:21:14 +08:00
parent 57f322a818
commit 7fece7e9b3
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom.gyp
View file

@ -144,6 +144,7 @@
}, { }, {
'copied_libraries': [ 'copied_libraries': [
'<(libchromiumcontent_dir)/pdf.dll', '<(libchromiumcontent_dir)/pdf.dll',
'<(libchromiumcontent_dir)/ffmpeg.dll',
], ],
}], }],
], ],
@ -193,6 +194,7 @@
}, { }, {
'copied_libraries': [ 'copied_libraries': [
'<(PRODUCT_DIR)/lib/libnode.so', '<(PRODUCT_DIR)/lib/libnode.so',
'<(libchromiumcontent_dir)/libffmpeg.so',
], ],
}], }],
], ],
@ -461,6 +463,7 @@
}, { }, {
'copied_libraries': [ 'copied_libraries': [
'<(PRODUCT_DIR)/libnode.dylib', '<(PRODUCT_DIR)/libnode.dylib',
'<(libchromiumcontent_dir)/libffmpeg.dylib',
], ],
}], }],
], ],

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 2a5cd7178b641de91ca6eb0bca826fea588f923a Subproject commit d06de26dff8b641d9aee4c78ee830b416710f554