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

mac: Fix linking with boringssl

Browse source
This commit is contained in:
Cheng Zhao 2015-04-07 11:28:56 +08:00
parent 512deae254
commit 938182a3eb
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brightray/brightray.gyp
View file

@ -116,9 +116,6 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework', '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
# This library is built as shared library to avoid symbols
# conflict with Node.
'<(libchromiumcontent_dir)/libboringssl.dylib',
], ],
}, },
}], }],
@ -154,17 +151,17 @@
], ],
}, },
}], }],
['OS=="win" and libchromiumcontent_component', { ['OS=="win" and libchromiumcontent_component==1', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/base_static.lib', '<(libchromiumcontent_dir)/base_static.lib',
'<(libchromiumcontent_dir)/sandbox.lib', '<(libchromiumcontent_dir)/sandbox.lib',
], ],
}, },
}, { }],
['OS=="win" and libchromiumcontent_component==0', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/boringssl.dll',
'<(libchromiumcontent_dir)/ffmpegsumo.lib', '<(libchromiumcontent_dir)/ffmpegsumo.lib',
'<(libchromiumcontent_dir)/libyuv.lib', '<(libchromiumcontent_dir)/libyuv.lib',
# content_browser.gypi: # content_browser.gypi:

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 301d2d617c64ed020bf787d541b9a7d5e10941a8 Subproject commit b371f0a7b0c1dd47d68f6ea5bade36451a13e7e1