diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:20:56 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:20:56 +0000 |
| commit | 9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf (patch) | |
| tree | b08c173979a25edab7d038c8ef1f0904446f5618 /chrome/chrome.gyp | |
| parent | 993c57e3ad539630ecad9ce21e1fdaa1c42366f5 (diff) | |
| download | chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.zip chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.tar.gz chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.tar.bz2 | |
GYP changed to extract D3DX9 DLL into product dir.
This is so ANGLE will find it.
Also added ANGLE as a Chrome dependency.
There must be a better way to detect whether there is a directxsdk directory in third_party. I'm open to ideas.
TEST=try, check d3dx9 is copied to product dir when building chrome, check ANGLE initializes
BUG=45898
Review URL: http://codereview.chromium.org/2843060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 67c7d5a..4a6a5d3 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -68,6 +68,7 @@ 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], + 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', 'conditions': [ ['OS=="win"', { 'nacl_defines': [ @@ -715,6 +716,33 @@ 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:libEGL', + '../third_party/angle/src/build_angle.gyp:libGLESv2', + ], + }], + ['OS=="win" and directxsdk_exists=="True"', { + 'actions': [ + { + 'action_name': 'extract_d3dx9', + 'variables': { + 'input': 'Aug2009_d3dx9_42_x86.cab', + 'output': 'd3dx9_42.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'expand', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '-F:<(output)', + '<(PRODUCT_DIR)', + ], + }, + ], }], ['OS=="linux" and target_arch!="arm"', { 'sources': [ |