| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'dependencies': [ | 6 'dependencies': [ |
| 7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
| 8 '../skia/skia.gyp:skia', | 8 '../skia/skia.gyp:skia', |
| 9 '../ui/gl/gl.gyp:gl', | 9 '../ui/gl/gl.gyp:gl', |
| 10 ], | 10 ], |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 ], | 33 ], |
| 34 'link_settings': { | 34 'link_settings': { |
| 35 'libraries': [ | 35 'libraries': [ |
| 36 '-lsetupapi.lib', | 36 '-lsetupapi.lib', |
| 37 ], | 37 ], |
| 38 }, | 38 }, |
| 39 'copies': [ | 39 'copies': [ |
| 40 { | 40 { |
| 41 'destination': '<(PRODUCT_DIR)', | 41 'destination': '<(PRODUCT_DIR)', |
| 42 'files': [ | 42 'files': [ |
| 43 '<(windows_sdk_path)/Redist/D3D/x86/d3dcompiler_46.dll', | 43 '<(windows_sdk_path)/Redist/D3D/<(winsdk_arch)/d3dcompiler_46.dll', |
| 44 ], | 44 ], |
| 45 }, | 45 }, |
| 46 ], | 46 ], |
| 47 }], | 47 }], |
| 48 ['OS=="win" and directxsdk_exists=="True"', { | 48 ['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', { |
| 49 # We don't support x64 prior to Win7 and D3DCompiler_43.dll is |
| 50 # not needed on Vista+. |
| 49 'actions': [ | 51 'actions': [ |
| 50 { | 52 { |
| 51 'action_name': 'extract_d3dcompiler', | 53 'action_name': 'extract_d3dcompiler', |
| 52 'variables': { | 54 'variables': { |
| 53 'input': 'Jun2010_D3DCompiler_43_x86.cab', | 55 'input': 'Jun2010_D3DCompiler_43_x86.cab', |
| 54 'output': 'D3DCompiler_43.dll', | 56 'output': 'D3DCompiler_43.dll', |
| 55 }, | 57 }, |
| 56 'inputs': [ | 58 'inputs': [ |
| 57 '../third_party/directxsdk/files/Redist/<(input)', | 59 '../third_party/directxsdk/files/Redist/<(input)', |
| 58 ], | 60 ], |
| (...skipping 16 matching lines...) Expand all Loading... |
| 75 '<(DEPTH)/third_party/openmax/il', | 77 '<(DEPTH)/third_party/openmax/il', |
| 76 ], | 78 ], |
| 77 }], | 79 }], |
| 78 ['target_arch!="arm" and chromeos == 1', { | 80 ['target_arch!="arm" and chromeos == 1', { |
| 79 'include_dirs': [ | 81 'include_dirs': [ |
| 80 '<(DEPTH)/third_party/libva', | 82 '<(DEPTH)/third_party/libva', |
| 81 ], | 83 ], |
| 82 }], | 84 }], |
| 83 ], | 85 ], |
| 84 } | 86 } |
| OLD | NEW |