From cf91961ff27d49d9ab41f4f222d096e980c729a5 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 30 Nov 2016 19:50:37 -0500 Subject: [PATCH] Windows: Fix missing InsertAllocatorDispatch symbol in cef_sandbox.lib (issue #2044) --- tools/make_distrib.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/make_distrib.py b/tools/make_distrib.py index e9cf51c06..57c30587d 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -244,9 +244,10 @@ def combine_libs(build_dir, libs, dest_lib): cmdline = 'msvs_env.bat win%s python combine_libs.py -o "%s"' % (platform_arch, dest_lib) for lib in libs: lib_path = os.path.join(build_dir, lib) - if not path_exists(lib_path): - raise Exception('Library not found: ' + lib_path) - cmdline = cmdline + ' "%s"' % lib_path + for path in get_files(lib_path): # Expand wildcards in |lib_path|. + if not path_exists(path): + raise Exception('File not found: ' + path) + cmdline = cmdline + ' "%s"' % path run(cmdline, os.path.join(cef_dir, 'tools')) def run(command_line, working_dir): @@ -585,6 +586,7 @@ if platform == 'windows': libcef_dll_file = 'libcef.dll.lib' sandbox_libs = [ + 'obj\\base\\allocator\\unified_allocator_shim\\*.obj', 'obj\\base\\base.lib', 'obj\\base\\base_static.lib', 'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib',