diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 22:20:52 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 22:20:52 +0000 |
| commit | 0429d943467575406d5fbc3ac859a6e9604d6d0d (patch) | |
| tree | 8c093acdf6b43d11354d58ef94fcc6a77ba4ea1e /chrome | |
| parent | a4ad544b57c98407e6687abd77897c4cdbcdfb60 (diff) | |
| download | chromium_src-0429d943467575406d5fbc3ac859a6e9604d6d0d.zip chromium_src-0429d943467575406d5fbc3ac859a6e9604d6d0d.tar.gz chromium_src-0429d943467575406d5fbc3ac859a6e9604d6d0d.tar.bz2 | |
Added D3DCompiler_42.dll to the installer.
This is a runtime dependency of D3DX9 which is needed to make ANGLE work on Windows.
TEST=will run try when blocking CL is landed
BUG=none
Review URL: http://codereview.chromium.org/3134037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 20 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 1 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES | 1 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 5 |
4 files changed, 27 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 6d67921..cad2766 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -755,6 +755,26 @@ '<(PRODUCT_DIR)', ], }, + { + 'action_name': 'extract_d3dcompiler', + 'variables': { + 'input': 'Aug2009_D3DCompiler_42_x86.cab', + 'output': 'D3DCompiler_42.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)', + ], + }, ], }], ['OS=="linux" and target_arch!="arm"', { diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 48100b8..cbff68c 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -49,6 +49,7 @@ Extensions\*.*: %(VersionDir)s\Extensions\ av*.dll: %(VersionDir)s\ pdf.dll: %(VersionDir)s\ d3dx9_42.dll: %(VersionDir)s\ +D3DCompiler_42.dll: %(VersionDir)s\ libEGL.dll: %(VersionDir)s\ libGLESv2.dll: %(VersionDir)s\ diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 255cd51..08bda9c 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -65,5 +65,6 @@ gcswf32.dll plugin.vch pdf.dll d3dx9_42.dll +D3DCompiler_42.dll libEGL.dll libGLESv2.dll
\ No newline at end of file diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index a5f7da5..fb260b6 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -354,6 +354,11 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { + 'filename': 'D3DCompiler_42.dll', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { 'filename': 'libEGL.dll', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], |