From ff6d6e60eefb584e8db5ad279a9ac50f4b2df261 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 6 Feb 2014 22:10:31 +0000 Subject: [PATCH] Windows: Explicitly specify the DLLs to include in the binary distribution. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1750@1599 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tools/make_distrib.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/make_distrib.py b/tools/make_distrib.py index db187b17e..bc0b05274 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -490,6 +490,14 @@ if mode == 'standard': output_dir, options.quiet) if platform == 'windows': + binaries = [ + 'd3dcompiler_46.dll', + 'ffmpegsumo.dll', + 'libcef.dll', + 'libEGL.dll', + 'libGLESv2.dll', + ] + if options.ninjabuild: out_dir = os.path.join(src_dir, 'out') libcef_dll_file = 'libcef.dll.lib' @@ -525,7 +533,8 @@ if platform == 'windows': dst_dir = os.path.join(output_dir, 'Debug') make_dir(dst_dir, options.quiet) copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet) - copy_files(os.path.join(build_dir, '*.dll'), dst_dir, options.quiet) + for binary in binaries: + copy_file(os.path.join(build_dir, binary), os.path.join(dst_dir, binary), options.quiet) copy_file(os.path.join(build_dir, libcef_dll_file), os.path.join(dst_dir, 'libcef.lib'), \ options.quiet) combine_libs(build_dir, sandbox_libs, os.path.join(dst_dir, 'cef_sandbox.lib')); @@ -545,7 +554,8 @@ if platform == 'windows': dst_dir = os.path.join(output_dir, 'Release') make_dir(dst_dir, options.quiet) copy_files(os.path.join(script_dir, 'distrib/win/*.dll'), dst_dir, options.quiet) - copy_files(os.path.join(build_dir, '*.dll'), dst_dir, options.quiet) + for binary in binaries: + copy_file(os.path.join(build_dir, binary), os.path.join(dst_dir, binary), options.quiet) if mode != 'client': copy_file(os.path.join(build_dir, libcef_dll_file), os.path.join(dst_dir, 'libcef.lib'), \