Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_gpu.gypi

Issue 22262003: Fix Win64 DirectX redistributables (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gpu.gypi
===================================================================
--- content/content_gpu.gypi (revision 215626)
+++ content/content_gpu.gypi (working copy)
@@ -40,12 +40,14 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
- '<(windows_sdk_path)/Redist/D3D/x86/d3dcompiler_46.dll',
+ '<(windows_sdk_path)/Redist/D3D/<(winsdk_arch)/d3dcompiler_46.dll',
],
},
],
}],
- ['OS=="win" and directxsdk_exists=="True"', {
+ ['OS=="win" and target_arch=="ia32" and directxsdk_exists=="True"', {
+ # We don't support x64 prior to Win7 and D3DCompiler_43.dll is
+ # not needed on Vista+.
'actions': [
{
'action_name': 'extract_d3dcompiler',
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698