bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-01-27 09:41:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Windows: Add boringssl to cef_sandbox to fix VS2017 link error (fixes issue #2743)"

Browse Source 
This reverts commit 2cf916e6d5d45c5ffde9d619899b89e4ee107a28.

This change causes linker errors with third-party projects using VS2019 that also link openssl.

cef_sandbox.lib(err.obj) : error LNK2005: _ERR_get_error already defined in websockets.lib(mbedtls-client.obj)
cef_sandbox.lib(err.obj) : error LNK2005: _ERR_error_string already defined in websockets.lib(ssl_lib.obj)
cef_sandbox.lib(err.obj) : error LNK2005: _ERR_error_string_n already defined in websockets.lib(ssl_lib.obj)
cef_sandbox.lib(err.obj) : error LNK2005: _ERR_free_strings already defined in websockets.lib(ssl_lib.obj)
This commit is contained in:
Marshall Greenblatt 2019-08-29 14:44:26 -04:00
parent 8f0a202e0c
commit 98527317a8
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/cef_variables.cmake.in
View File

@ -492,10 +492,7 @@ if(OS_WINDOWS)
# Libraries required by cef_sandbox.lib.
set(CEF_SANDBOX_STANDARD_LIBS
dbghelp.lib
PowrProf.lib
Propsys.lib
psapi.lib
SetupAPI.lib
version.lib
wbemuuid.lib
winmm.lib

2
tools/make_distrib.py
View File

@ -849,8 +849,6 @@ if platform == 'windows':
'obj\\base\\win\\pe_image.lib',
cef_sandbox_lib,
'obj\\sandbox\\win\\sandbox.lib',
'obj\\third_party\\boringssl\\boringssl.lib',
'obj\\third_party\\boringssl\\boringssl_asm.lib',
]
# Generate the cef_sandbox.lib merged library. A separate *_sandbox build