Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: build/libs.gyp

Issue 264064: Adding in libX11, which seems to be needed for test_common on linux.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'dx_redist_path': '../../o3d-internal/third_party/dx_nov_2007_redist', 8 'dx_redist_path': '../../o3d-internal/third_party/dx_nov_2007_redist',
9 'dx_redist_exists': '<!(python file_exists.py ../../o3d-internal/third_party /dx_nov_2007_redist/d3dx9_36.dll)', 9 'dx_redist_exists': '<!(python file_exists.py ../../o3d-internal/third_party /dx_nov_2007_redist/d3dx9_36.dll)',
10 }, 10 },
(...skipping 15 matching lines...) Expand all
26 'direct_dependent_settings': { 26 'direct_dependent_settings': {
27 'defines': [ 27 'defines': [
28 'GL_GLEXT_PROTOTYPES', 28 'GL_GLEXT_PROTOTYPES',
29 ], 29 ],
30 'scons_variable_settings': { 30 'scons_variable_settings': {
31 'LIBPATH': [ 31 'LIBPATH': [
32 '../../<(glewdir)/lib', 32 '../../<(glewdir)/lib',
33 ], 33 ],
34 }, 34 },
35 'libraries': [ 35 'libraries': [
36 "-lGL", 36 '-lGL',
37 "-lGLEW", 37 '-lGLEW',
38 '-lX11',
38 ], 39 ],
39 }, 40 },
40 }, 41 },
41 ], 42 ],
42 [ 'OS=="mac"', 43 [ 'OS=="mac"',
43 { 44 {
44 'direct_dependent_settings': { 45 'direct_dependent_settings': {
45 'libraries': [ 46 'libraries': [
46 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 47 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
47 ], 48 ],
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 } 178 }
178 ], 179 ],
179 ], 180 ],
180 } 181 }
181 182
182 # Local Variables: 183 # Local Variables:
183 # tab-width:2 184 # tab-width:2
184 # indent-tabs-mode:nil 185 # indent-tabs-mode:nil
185 # End: 186 # End:
186 # vim: set expandtab tabstop=2 shiftwidth=2: 187 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698