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

Still link with shared_library of boringssl

Browse source
This commit is contained in:
Cheng Zhao 2015-04-07 16:28:38 +08:00
parent 92ce000bb2
commit b9ddf0eb31
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/brightray.gyp
View file

@ -122,6 +122,9 @@
['OS=="mac" and libchromiumcontent_component==0', { ['OS=="mac" and libchromiumcontent_component==0', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
# This library is built as shared library to avoid symbols
# conflict with Node.
'<(libchromiumcontent_dir)/libboringssl.dylib',
# ui_base.gypi: # ui_base.gypi:
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
# net.gypi: # net.gypi:
@ -162,6 +165,7 @@
['OS=="win" and libchromiumcontent_component==0', { ['OS=="win" and libchromiumcontent_component==0', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<(libchromiumcontent_dir)/boringssl.lib',
'<(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 b371f0a7b0c1dd47d68f6ea5bade36451a13e7e1 Subproject commit 97917e790421e8617ce685a1e32cf98a64052f7a