Merge pull request #4530 from atom/shared-ffmpeg

Link with ffmpeg dynamically
This commit is contained in:
Cheng Zhao 2016-02-18 11:13:57 +08:00
commit 233961ea29
3 changed files with 5 additions and 2 deletions

View file

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

View file

@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = 'ad63d8ba890bcaad2f1b7e6de148b7992f4d3af7'
LIBCHROMIUMCONTENT_COMMIT = '1be1a55abba527d6fb0fc2a589cbaef2f5a6a79e'
PLATFORM = {
'cygwin': 'win32',

2
vendor/brightray vendored

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