diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
| commit | d73053211c5db825ad997b7900e69b2dd05f8b0c (patch) | |
| tree | fe5a5467ae1d08356918b569543d09e402234463 /o3d/core | |
| parent | e01087a666ae4be9e183484c7c7e4b5e127f0874 (diff) | |
| download | chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.zip chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.gz chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.bz2 | |
These are gyp file changes that start to make the Mac GYP build work.
It still doesn't but I want to checkpoint these changes.
Review URL: http://codereview.chromium.org/155890
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
| -rw-r--r-- | o3d/core/core.gyp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 0a47131..4e14c88 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -21,6 +21,14 @@ ], } ], + ['renderer == "gl"', + { + 'include_dirs': [ + '../../<(glewdir)/include', + '../../<(cgdir)/include', + ], + } + ], ], }, 'includes': [ @@ -35,7 +43,6 @@ '../../<(pngdir)/libpng.gyp:libpng', '../../<(zlibdir)/zlib.gyp:zlib', '../../skia/skia.gyp:skia', - '../build/nacl.gyp:build_nacl', ], 'sources': [ 'cross/bitmap.cc', @@ -344,10 +351,6 @@ { 'target_name': 'o3dCoreTest', 'type': 'none', - 'dependencies': [ - 'o3dCore', - 'o3dCorePlatform', - ], 'direct_dependent_settings': { 'sources': [ 'cross/bitmap_test.cc', |