From d73053211c5db825ad997b7900e69b2dd05f8b0c Mon Sep 17 00:00:00 2001 From: "gspencer@google.com" Date: Wed, 22 Jul 2009 16:29:41 +0000 Subject: 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 --- o3d/core/core.gyp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'o3d/core') 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', -- cgit v1.1