diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:35:36 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:35:36 +0000 |
| commit | c137498b90a2e65281411d233a3d86533c365a74 (patch) | |
| tree | b72f8070c99b5ec82a2b4356906eba55235d0a3e /chrome/chrome.gyp | |
| parent | 7c7723c7f90df28d97e345b09a51811b99e3e5d2 (diff) | |
| download | chromium_src-c137498b90a2e65281411d233a3d86533c365a74.zip chromium_src-c137498b90a2e65281411d233a3d86533c365a74.tar.gz chromium_src-c137498b90a2e65281411d233a3d86533c365a74.tar.bz2 | |
Revert 53076 - 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
TBR=apatrick@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4a6a5d3..67c7d5a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -68,7 +68,6 @@ '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': [ @@ -716,33 +715,6 @@ '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': [ |