bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix missing InsertAllocatorDispatch symbol in cef_sandbox.lib (issue #2044)

This commit is contained in:
Marshall Greenblatt 2016-11-30 19:50:37 -05:00
parent de18fc4292
commit cf91961ff2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/make_distrib.py
View File

@ -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) cmdline = 'msvs_env.bat win%s python combine_libs.py -o "%s"' % (platform_arch, dest_lib)
for lib in libs: for lib in libs:
lib_path = os.path.join(build_dir, lib) lib_path = os.path.join(build_dir, lib)
if not path_exists(lib_path): for path in get_files(lib_path): # Expand wildcards in |lib_path|.
raise Exception('Library not found: ' + lib_path) if not path_exists(path):
cmdline = cmdline + ' "%s"' % lib_path raise Exception('File not found: ' + path)
cmdline = cmdline + ' "%s"' % path
run(cmdline, os.path.join(cef_dir, 'tools')) run(cmdline, os.path.join(cef_dir, 'tools'))
def run(command_line, working_dir): def run(command_line, working_dir):
@ -585,6 +586,7 @@ if platform == 'windows':
libcef_dll_file = 'libcef.dll.lib' libcef_dll_file = 'libcef.dll.lib'
sandbox_libs = [ sandbox_libs = [
'obj\\base\\allocator\\unified_allocator_shim\\*.obj',
'obj\\base\\base.lib', 'obj\\base\\base.lib',
'obj\\base\\base_static.lib', 'obj\\base\\base_static.lib',
'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib', 'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib',