summaryrefslogtreecommitdiffstats
path: root/o3d/build
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 09:18:34 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 09:18:34 +0000
commit2c95a1afbd9eabf470592d245ccdcb1b6bac9ed5 (patch)
tree0b49338ffdd7f9157ac3dab5a608471c2691312c /o3d/build
parent5959b8bdee7242820c6cc55c6860adbf91aa40d8 (diff)
downloadchromium_src-2c95a1afbd9eabf470592d245ccdcb1b6bac9ed5.zip
chromium_src-2c95a1afbd9eabf470592d245ccdcb1b6bac9ed5.tar.gz
chromium_src-2c95a1afbd9eabf470592d245ccdcb1b6bac9ed5.tar.bz2
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
Diffstat (limited to 'o3d/build')
-rw-r--r--o3d/build/libs.gyp4
1 files changed, 2 insertions, 2 deletions
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",
],