diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:18:17 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:18:17 +0000 |
| commit | 0cd7700f258468742e4d9d7f8583d23746875302 (patch) | |
| tree | b0f5f2413899d6080a9a02e74ac97a5a4ea628aa | |
| parent | fcaa54ac4e3be4b65e99526686c003574735d6c6 (diff) | |
| download | chromium_src-0cd7700f258468742e4d9d7f8583d23746875302.zip chromium_src-0cd7700f258468742e4d9d7f8583d23746875302.tar.gz chromium_src-0cd7700f258468742e4d9d7f8583d23746875302.tar.bz2 | |
Relanding r53076 with linux fix.
TEST=try
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53810 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/dir_exists.py | 10 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 28 |
3 files changed, 39 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 0643464..1d29831 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -107,6 +107,7 @@ '../gears/gears.gyp:*', '../rlz/rlz.gyp:*', '../sandbox/sandbox.gyp:*', + '../third_party/angle/src/build_angle.gyp:*', '../third_party/bsdiff/bsdiff.gyp:*', '../third_party/bspatch/bspatch.gyp:*', '../third_party/gles2_book/gles2_book.gyp:*', @@ -271,7 +272,6 @@ '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', '../chrome_frame/chrome_frame.gyp:npchrome_frame', - '../third_party/angle/src/build_angle.gyp:*', ], }, { diff --git a/build/dir_exists.py b/build/dir_exists.py new file mode 100644 index 0000000..d1c194f --- /dev/null +++ b/build/dir_exists.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os.path +import sys + +sys.stdout.write(str(os.path.isdir(sys.argv[1]))) +sys.exit(0) diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9d20256..5ea6dd5 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': [ @@ -718,6 +719,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': [ |