mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Revert "Windows: Add boringssl to cef_sandbox to fix VS2017 link error (fixes issue #2743)"
This reverts commit 2cf916e6d5
.
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:
@ -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
|
||||
|
Reference in New Issue
Block a user