diff options
| author | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-06 16:00:39 +0000 |
|---|---|---|
| committer | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-06 16:00:39 +0000 |
| commit | 91a517a760cec07b672be6d3975d2c8128841177 (patch) | |
| tree | 72303a3767e73742943911b44d2cba09bcffefcb /content | |
| parent | 7c39486cdfb750c2bb0f6e1f4b71a7364ed23c30 (diff) | |
| download | chromium_src-91a517a760cec07b672be6d3975d2c8128841177.zip chromium_src-91a517a760cec07b672be6d3975d2c8128841177.tar.gz chromium_src-91a517a760cec07b672be6d3975d2c8128841177.tar.bz2 | |
Revert 175201 due to failures in official build.
> Windows: Remove content's dependency on d3dx9_43.dll.
>
> ANGLE doesn't need this loaded anymore.
>
> Review URL: https://chromiumcodereview.appspot.com/11737027
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11791013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index b2b47a3..35aedb1 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -531,6 +531,7 @@ 'link_settings': { 'libraries': [ '-ld3d9.lib', + '-ld3dx9.lib', '-ldxva2.lib', '-lstrmiids.lib', '-lmf.lib', @@ -542,6 +543,7 @@ 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'DelayLoadDLLs': [ 'd3d9.dll', + 'd3dx9_43.dll', 'dxva2.dll', 'mf.dll', 'mfplat.dll', diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index abf746b..66cb3c6 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -48,6 +48,26 @@ ['OS=="win" and directxsdk_exists=="True"', { 'actions': [ { + 'action_name': 'extract_d3dx9', + 'variables': { + 'input': 'Jun2010_d3dx9_43_x86.cab', + 'output': 'd3dx9_43.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', + ], + }, + { 'action_name': 'extract_d3dcompiler', 'variables': { 'input': 'Jun2010_D3DCompiler_43_x86.cab', |