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

Side by Side Diff: gyp/common_conditions.gypi

Issue 22881005: Replace uses of GR_API by SK_API. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 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 | « Makefile.old ('k') | gyp/gpu.gyp » ('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 ], 6 ],
7 'conditions' : [ 7 'conditions' : [
8 [ 'skia_gpu == 1', 8 [ 'skia_gpu == 1',
9 { 9 {
10 'defines': [ 10 'defines': [
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 # suppressions below here were added for clang 222 # suppressions below here were added for clang
223 '-Wno-unused-parameter', 223 '-Wno-unused-parameter',
224 '-Wno-c++11-extensions' 224 '-Wno-c++11-extensions'
225 ], 225 ],
226 'conditions' : [ 226 'conditions' : [
227 [ 'skia_shared_lib', { 227 [ 'skia_shared_lib', {
228 'cflags': [ 228 'cflags': [
229 '-fPIC', 229 '-fPIC',
230 ], 230 ],
231 'defines': [ 231 'defines': [
232 'GR_DLL=1',
233 'GR_IMPLEMENTATION=1',
234 'SKIA_DLL', 232 'SKIA_DLL',
235 'SKIA_IMPLEMENTATION=1', 233 'SKIA_IMPLEMENTATION=1',
236 ], 234 ],
237 }], 235 }],
238 [ 'skia_os == "nacl"', { 236 [ 'skia_os == "nacl"', {
239 'defines': [ 237 'defines': [
240 'SK_BUILD_FOR_NACL', 238 'SK_BUILD_FOR_NACL',
241 ], 239 ],
242 'link_settings': { 240 'link_settings': {
243 'libraries': [ 241 'libraries': [
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 ], 445 ],
448 'cflags_cc': [ 446 'cflags_cc': [
449 '-fno-rtti', 447 '-fno-rtti',
450 ], 448 ],
451 'conditions': [ 449 'conditions': [
452 [ 'skia_shared_lib', { 450 [ 'skia_shared_lib', {
453 'cflags': [ 451 'cflags': [
454 '-fPIC', 452 '-fPIC',
455 ], 453 ],
456 'defines': [ 454 'defines': [
457 'GR_DLL=1',
458 'GR_IMPLEMENTATION=1',
459 'SKIA_DLL', 455 'SKIA_DLL',
460 'SKIA_IMPLEMENTATION=1', 456 'SKIA_IMPLEMENTATION=1',
461 ], 457 ],
462 }], 458 }],
463 [ 'skia_profile_enabled == 1', { 459 [ 'skia_profile_enabled == 1', {
464 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 460 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
465 }], 461 }],
466 ], 462 ],
467 }, 463 },
468 ], 464 ],
(...skipping 10 matching lines...) Expand all
479 'xcode_settings': { 475 'xcode_settings': {
480 'SYMROOT': '<(DEPTH)/xcodebuild', 476 'SYMROOT': '<(DEPTH)/xcodebuild',
481 }, 477 },
482 } 478 }
483 479
484 # Local Variables: 480 # Local Variables:
485 # tab-width:2 481 # tab-width:2
486 # indent-tabs-mode:nil 482 # indent-tabs-mode:nil
487 # End: 483 # End:
488 # vim: set expandtab tabstop=2 shiftwidth=2: 484 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « Makefile.old ('k') | gyp/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698