github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

win: Ignore duplicate symbols between BoringSSL and OpenSSL

Browse Source
This commit is contained in:
Cheng Zhao
2015-04-07 22:56:21 +08:00
parent 9a458785b6
commit 0cc36377a5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common.gypi
View File

@@ -191,6 +191,9 @@
},
'VCLinkerTool': {
'AdditionalOptions': [
# Force linking even though we have duplicate symbols between
# BoringSSL and OpenSSL.
'/FORCE:MULTIPLE',
# ATL 8.0 included in WDK 7.1 makes the linker to generate following
# warnings:
# - warning LNK4254: section 'ATL' (50000040) merged into

2
vendor/brightray vendored

Submodule vendor/brightray updated: ae360b94ff...616ce9051f