From 5574d1c32fb65005a1ccd8ace7278df9c3c639b7 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 6 Aug 2019 17:19:03 -0400 Subject: [PATCH] Windows: Add boringssl to cef_sandbox to fix VS2017 link error (fixes issue #2743) --- cmake/cef_variables.cmake.in | 3 +++ tools/make_distrib.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in index 6fca2d54e..dcaf182f0 100644 --- a/cmake/cef_variables.cmake.in +++ b/cmake/cef_variables.cmake.in @@ -492,7 +492,10 @@ 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 diff --git a/tools/make_distrib.py b/tools/make_distrib.py index f4154dbc9..fba2fd7b7 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -849,6 +849,8 @@ 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