diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 01:04:50 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 01:04:50 +0000 |
| commit | ef891ad89351df3721961841387c739d30a9417f (patch) | |
| tree | b689d1c7adde97443f40a85a584b6b962a8f61d8 /o3d/build | |
| parent | f554832167558b7f4810883b59aeb73b8f79114f (diff) | |
| download | chromium_src-ef891ad89351df3721961841387c739d30a9417f.zip chromium_src-ef891ad89351df3721961841387c739d30a9417f.tar.gz chromium_src-ef891ad89351df3721961841387c739d30a9417f.tar.bz2 | |
Trying to fix the build. gman taking over.
Review URL: http://codereview.chromium.org/329002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/libs.gyp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 1e8b4f2..3f553c8 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -15,7 +15,7 @@ { 'target_name': 'gl_libs', 'type': 'none', - 'direct_dependent_settings': { + 'all_dependent_settings': { 'include_dirs': [ '../../<(glewdir)/include', ], @@ -23,7 +23,7 @@ 'conditions': [ [ 'OS=="linux"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'defines': [ 'GL_GLEXT_PROTOTYPES', ], @@ -42,7 +42,7 @@ ], [ 'OS=="mac"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], @@ -51,7 +51,7 @@ ], [ 'OS=="win"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'libraries': [ '-lOpenGL32.lib', '../../<(glewdir)/lib/glew32.lib', @@ -65,7 +65,7 @@ 'target_name': 'cg_libs', 'type': 'none', 'hard_dependency': 1, - 'direct_dependent_settings': { + 'all_dependent_settings': { 'include_dirs': [ '../../<(cgdir)/include', ], @@ -73,7 +73,7 @@ 'conditions': [ [ 'OS=="linux"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'scons_variable_settings': { 'LIBPATH': [ '<(PRODUCT_DIR)', @@ -88,7 +88,7 @@ ], [ 'OS=="win"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'libraries': [ "../../<(cgdir)/lib/cg.lib", "../../<(cgdir)/lib/cgD3D9.lib", @@ -100,7 +100,7 @@ ], [ 'OS=="mac"', { - 'direct_dependent_settings': { + 'all_dependent_settings': { 'mac_framework_dirs': [ "<(PRODUCT_DIR)/Library/Frameworks", ], @@ -156,7 +156,7 @@ { 'target_name': 'dx_dll', 'type': 'none', - 'direct_dependent_settings': { + 'all_dependent_settings': { 'include_dirs': [ '$(DXSDK_DIR)/Include', ], |