diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:20:56 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:20:56 +0000 |
| commit | 9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf (patch) | |
| tree | b08c173979a25edab7d038c8ef1f0904446f5618 /build | |
| parent | 993c57e3ad539630ecad9ce21e1fdaa1c42366f5 (diff) | |
| download | chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.zip chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.tar.gz chromium_src-9e02d6b8b23264cbb4c481ec7b5b07c6ab7583bf.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 2 | ||||
| -rw-r--r-- | build/dir_exists.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index f8207b4..715eb8d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -26,6 +26,7 @@ '../skia/skia.gyp:*', '../testing/gmock.gyp:*', '../testing/gtest.gyp:*', + '../third_party/angle/src/build_angle.gyp:*', '../third_party/bzip2/bzip2.gyp:*', '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', '../third_party/cld/cld.gyp:*', @@ -264,7 +265,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) |