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

Side by Side Diff: gyp/common_conditions.gypi

Issue 869443003: Don't require -DSK_USE_POSIX_THREADS. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | src/core/SkPixelRef.cpp » ('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_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 625 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
626 ], 626 ],
627 }], 627 }],
628 [ 'skia_profile_enabled == 1', { 628 [ 'skia_profile_enabled == 1', {
629 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 629 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
630 }], 630 }],
631 ], 631 ],
632 }, 632 },
633 ], 633 ],
634 634
635 # We can POD-style initialization of static mutexes to avoid generating
636 # static initializers if we're using a pthread-compatible thread interface.
637 [ 'skia_os != "win"', {
638 'defines': [
639 'SK_USE_POSIX_THREADS',
640 ],
641 }],
642
643 [ 'skia_moz2d', { 635 [ 'skia_moz2d', {
644 'defines': [ 636 'defines': [
645 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 637 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
646 ], 638 ],
647 }], 639 }],
648 640
649 [ 'skia_is_bot', { 641 [ 'skia_is_bot', {
650 'defines': [ 'SK_CRASH_HANDLER' ], 642 'defines': [ 'SK_CRASH_HANDLER' ],
651 }], 643 }],
652 644
653 ], # end 'conditions' 645 ], # end 'conditions'
654 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 646 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
655 'xcode_settings': { 647 'xcode_settings': {
656 'SYMROOT': '<(DEPTH)/xcodebuild', 648 'SYMROOT': '<(DEPTH)/xcodebuild',
657 }, 649 },
658 } 650 }
OLDNEW
« no previous file with comments | « no previous file | src/core/SkPixelRef.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698