github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 16:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

win: Link with sandbox and base_static under component build

Browse Source
This commit is contained in:
Cheng Zhao
2015-04-06 12:03:22 +08:00
parent 9fd0f7e78e
commit ed5660909b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
brightray/brightray.gyp
View File

@@ -116,15 +116,15 @@
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
# This library is built as shared library to avoid symbols
# conflict with Node.
'<(libchromiumcontent_dir)/libboringssl.dylib',
],
},
}],
['OS=="mac" and libchromiumcontent_component==0', {
'link_settings': {
'libraries': [
# This library is built as shared library to avoid symbols
# conflict with Node.
'<(libchromiumcontent_dir)/libboringssl.dylib',
# ui_base.gypi:
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
# net.gypi:
@@ -154,13 +154,11 @@
],
},
}],
['OS=="win"', {
['OS=="win" and libchromiumcontent_component', {
'link_settings': {
'libraries': [
'<(libchromiumcontent_dir)/base_static.lib',
'<(libchromiumcontent_dir)/chromiumcontent.dll.lib',
'<(libchromiumcontent_dir)/chromiumviews.lib',
'<(libchromiumcontent_dir)/sandbox_static.lib',
'<(libchromiumcontent_dir)/sandbox.lib',
],
},
}],

2
brightray/vendor/libchromiumcontent vendored

Submodule brightray/vendor/libchromiumcontent updated: 1b7aec028c...fa70c1a296