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

Side by Side Diff: gyp/angle.gyp

Issue 86423002: Use same ANGLE as Chrome (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: reorder Created 7 years 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 | « expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json ('k') | 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 # ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9 1 # ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
2 2
3 { 3 {
4 'conditions': [ 4 'conditions': [
5 [ 'skia_angle', { 5 [ 'skia_angle', {
6 'target_defaults': { 6 'target_defaults': {
7 'include_dirs': [
8 '$(DXSDK_DIR)/Include',
9 ],
10 'msvs_settings': {
11 'VCLinkerTool': {
12 'conditions': [
13 [ 'skia_arch_width == 32 ', {
14 'AdditionalLibraryDirectories': [
15 '$(DXSDK_DIR)/Lib/x86',
16 ],
17 },{
18 'AdditionalLibraryDirectories': [
19 '$(DXSDK_DIR)/Lib/x64',
20 ],
21 }],
22 ],
23 },
24 },
7 'defines': [ 25 'defines': [
8 'NOMINMAX', 26 'NOMINMAX',
9 ], 27 ],
28 'defines/': [
29 ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'],
30 ],
10 }, 31 },
11 'variables': { 32 'variables': {
12 'component': 'static_library', 33 'component': 'static_library',
13 'skia_warnings_as_errors': 0, 34 'skia_warnings_as_errors': 0,
14 }, 35 },
15 'includes': [ 36 'includes': [
16 '../third_party/externals/angle/src/build_angle.gypi', 37 '../third_party/externals/angle/src/build_angle.gypi',
17 ], 38 ],
18 }], 39 }],
19 ], 40 ],
(...skipping 12 matching lines...) Expand all
32 ], 53 ],
33 }, 54 },
34 ], 55 ],
35 } 56 }
36 57
37 # Local Variables: 58 # Local Variables:
38 # tab-width:2 59 # tab-width:2
39 # indent-tabs-mode:nil 60 # indent-tabs-mode:nil
40 # End: 61 # End:
41 # vim: set expandtab tabstop=2 shiftwidth=2: 62 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698