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

Side by Side Diff: gyp/common_conditions.gypi

Issue 17094003: Add skia_exceptinos gyp define (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 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 | 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 {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 [ 'skia_warnings_as_errors', { 106 [ 'skia_warnings_as_errors', {
107 'msvs_settings': { 107 'msvs_settings': {
108 'VCCLCompilerTool': { 108 'VCCLCompilerTool': {
109 'WarnAsError': 'true', 109 'WarnAsError': 'true',
110 'AdditionalOptions': [ 110 'AdditionalOptions': [
111 '/we4189', # initialized but unused var warning 111 '/we4189', # initialized but unused var warning
112 ], 112 ],
113 }, 113 },
114 }, 114 },
115 }], 115 }],
116 [ 'skia_win_exceptions', {
117 'msvs_settings': {
118 'VCCLCompilerTool': {
119 'AdditionalOptions': [
120 '/EHsc',
121 ],
122 },
123 },
124 }],
116 ], 125 ],
117 }, 126 },
118 ], 127 ],
119 128
120 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 129 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
121 { 130 {
122 'defines': [ 131 'defines': [
123 'SK_SAMPLES_FOR_X', 132 'SK_SAMPLES_FOR_X',
124 'SK_BUILD_FOR_UNIX', 133 'SK_BUILD_FOR_UNIX',
125 ], 134 ],
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 'xcode_settings': { 423 'xcode_settings': {
415 'SYMROOT': '<(DEPTH)/xcodebuild', 424 'SYMROOT': '<(DEPTH)/xcodebuild',
416 }, 425 },
417 } 426 }
418 427
419 # Local Variables: 428 # Local Variables:
420 # tab-width:2 429 # tab-width:2
421 # indent-tabs-mode:nil 430 # indent-tabs-mode:nil
422 # End: 431 # End:
423 # vim: set expandtab tabstop=2 shiftwidth=2: 432 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698