summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 22:20:52 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 22:20:52 +0000
commit0429d943467575406d5fbc3ac859a6e9604d6d0d (patch)
tree8c093acdf6b43d11354d58ef94fcc6a77ba4ea1e /chrome/tools
parenta4ad544b57c98407e6687abd77897c4cdbcdfb60 (diff)
downloadchromium_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/tools')
-rw-r--r--chrome/tools/build/win/FILES1
-rw-r--r--chrome/tools/build/win/FILES.cfg5
2 files changed, 6 insertions, 0 deletions
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'],