diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 06:09:43 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 06:09:43 +0000 |
| commit | a7a15f3dc5acaa9551d6684b7a7a8aa3fd651ab6 (patch) | |
| tree | 47be8fff0789d3ae75be27a6060bf107f9312b89 | |
| parent | 56796b93900a832c7ed79c639ad74a1d899288b2 (diff) | |
| download | chromium_src-a7a15f3dc5acaa9551d6684b7a7a8aa3fd651ab6.zip chromium_src-a7a15f3dc5acaa9551d6684b7a7a8aa3fd651ab6.tar.gz chromium_src-a7a15f3dc5acaa9551d6684b7a7a8aa3fd651ab6.tar.bz2 | |
Fix Win64 DirectX redistributables
Adds a gyp variable to simplify WINSDK path strings,
and grabs the x64 files rather than x86.
BUG=268525,267893
Review URL: https://chromiumcodereview.appspot.com/22262003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215814 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index c554801..0d20ba9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1411,6 +1411,12 @@ }], # OS=="mac" or OS=="ios" ['OS=="win"', { 'conditions': [ + # This is the architecture convention used in WinSDK paths. + ['target_arch=="ia32"', { + 'winsdk_arch%': 'x86', + },{ + 'winsdk_arch%': '<(target_arch)', + }], ['component=="shared_library"', { 'win_use_allocator_shim%': 0, }], diff --git a/content/content_common.gypi b/content/content_common.gypi index f75f1ab..cae1e6e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -553,7 +553,7 @@ { 'action_name': 'extract_xinput', 'variables': { - 'input': 'APR2007_xinput_x86.cab', + 'input': 'APR2007_xinput_<(winsdk_arch).cab', 'output': 'xinput1_3.dll', }, 'inputs': [ diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index d2c6952..1afaa42 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -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', |