From 2c95a1afbd9eabf470592d245ccdcb1b6bac9ed5 Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Fri, 23 Oct 2009 09:18:34 +0000 Subject: TBR=apatrick Fix for OSX and last libs.gyp change No idea why but mac gyp gets an error with those 2 mac settings set to all_dependent_settings instead of direct_dependent_settings. This fix only makes gyp actually build the xcodeproj files. It doesn't actually make the builds work. Review URL: http://codereview.chromium.org/328005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29885 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/build/libs.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'o3d') diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 3f553c8..747530f 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -42,7 +42,7 @@ ], [ 'OS=="mac"', { - 'all_dependent_settings': { + 'direct_dependent_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], @@ -100,7 +100,7 @@ ], [ 'OS=="mac"', { - 'all_dependent_settings': { + 'direct_dependent_settings': { 'mac_framework_dirs': [ "<(PRODUCT_DIR)/Library/Frameworks", ], -- cgit v1.1