diff options
| author | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 19:31:59 +0000 |
|---|---|---|
| committer | vangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 19:31:59 +0000 |
| commit | f33a296f5cc94a65d6f6f37f74a2da1a3bcae4f3 (patch) | |
| tree | e7ce2dcce9b06886b61d2c6804bf63857366c3a4 /o3d | |
| parent | 8f107c66d83a09759e33e77fc75162de1437f442 (diff) | |
| download | chromium_src-f33a296f5cc94a65d6f6f37f74a2da1a3bcae4f3.zip chromium_src-f33a296f5cc94a65d6f6f37f74a2da1a3bcae4f3.tar.gz chromium_src-f33a296f5cc94a65d6f6f37f74a2da1a3bcae4f3.tar.bz2 | |
Adding the o3d-internal include path before the others so that if o3d-internal is there
it will be picked up first. This is how scons was setup. This is important for initializing swiftshader.
Review URL: http://codereview.chromium.org/331002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/common.gypi | 1 | ||||
| -rw-r--r-- | o3d/core/core.gyp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index fe7e0d9..7f39a0d 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -9,6 +9,7 @@ 'fcolladadir': 'third_party/fcollada/files', 'glewdir': 'third_party/glew/files', 'gtestdir': 'testing/gtest/include', + 'internaldir':'o3d-internal', 'jpegdir': 'third_party/libjpeg', 'nacldir': 'third_party/native_client/googleclient', 'nixysadir': 'o3d/third_party/nixysa', diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 9216f36..fe72c17 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -8,6 +8,9 @@ }, 'target_defaults': { 'include_dirs': [ + # The internal dir is first so that headers in internal can replace those + # in external + '../../<(internaldir)', '..', '../..', '../../<(gtestdir)', |