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

Side by Side Diff: gyp/common_conditions.gypi

Issue 19374006: make OpenCL optional for skpdiff (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: this-> Created 7 years, 5 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 | « experimental/skpdiff/skpdiff_util.cpp ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
11 'defines': [ 11 'defines': [
12 'SK_SUPPORT_GPU=1', 12 'SK_SUPPORT_GPU=1',
13 ], 13 ],
14 }, { 14 }, {
15 'defines': [ 15 'defines': [
16 'SK_SUPPORT_GPU=0', 16 'SK_SUPPORT_GPU=0',
17 ], 17 ],
18 }, 18 },
19 ], 19 ],
20 20 [ 'skia_opencl == 1',
21 {
22 'defines': [
23 'SK_SUPPORT_OPENCL=1',
24 ],
25 }, {
26 'defines': [
27 'SK_SUPPORT_OPENCL=0',
28 ],
29 },
30 ],
21 [ 'skia_os == "win"', 31 [ 'skia_os == "win"',
22 { 32 {
23 'defines': [ 33 'defines': [
24 'SK_BUILD_FOR_WIN32', 34 'SK_BUILD_FOR_WIN32',
25 'SK_IGNORE_STDINT_DOT_H', 35 'SK_IGNORE_STDINT_DOT_H',
26 '_CRT_SECURE_NO_WARNINGS', 36 '_CRT_SECURE_NO_WARNINGS',
27 'GR_GL_FUNCTION_TYPE=__stdcall', 37 'GR_GL_FUNCTION_TYPE=__stdcall',
28 ], 38 ],
29 'msvs_cygwin_shell': 0, 39 'msvs_cygwin_shell': 0,
30 'msvs_settings': { 40 'msvs_settings': {
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 'xcode_settings': { 464 'xcode_settings': {
455 'SYMROOT': '<(DEPTH)/xcodebuild', 465 'SYMROOT': '<(DEPTH)/xcodebuild',
456 }, 466 },
457 } 467 }
458 468
459 # Local Variables: 469 # Local Variables:
460 # tab-width:2 470 # tab-width:2
461 # indent-tabs-mode:nil 471 # indent-tabs-mode:nil
462 # End: 472 # End:
463 # vim: set expandtab tabstop=2 shiftwidth=2: 473 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « experimental/skpdiff/skpdiff_util.cpp ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698