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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1395783003: skia: Add ANGLE support on Mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 2 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 | « gyp/common.gypi ('k') | include/views/SkOSWindow_Mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 }], 456 }],
457 [ 'skia_keep_frame_pointer', { 457 [ 'skia_keep_frame_pointer', {
458 'cflags': [ '-fno-omit-frame-pointer' ], 458 'cflags': [ '-fno-omit-frame-pointer' ],
459 }], 459 }],
460 ], 460 ],
461 }, 461 },
462 ], 462 ],
463 463
464 [ 'skia_os == "mac"', 464 [ 'skia_os == "mac"',
465 { 465 {
466 'defines': [ 'SK_BUILD_FOR_MAC' ], 466 'defines': [
467 'SK_BUILD_FOR_MAC',
468 'YY_NO_INPUT', # ANGLE for mac hits -Wunneeded-internal-declaration if this isn't set.
bsalomon 2015/10/23 16:18:20 Is it possible to specify this only for the angle
469 ],
467 'configurations': { 470 'configurations': {
468 'Coverage': { 471 'Coverage': {
469 'xcode_settings': { 472 'xcode_settings': {
470 'GCC_OPTIMIZATION_LEVEL': '0', 473 'GCC_OPTIMIZATION_LEVEL': '0',
471 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', 474 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES',
472 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS' : 'YES', 475 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS' : 'YES',
473 }, 476 },
474 }, 477 },
475 'Debug': { 478 'Debug': {
476 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' }, 479 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' },
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 '-Wl,-rpath,\$$ORIGIN/lib', 626 '-Wl,-rpath,\$$ORIGIN/lib',
624 ], 627 ],
625 }], 628 }],
626 629
627 ], # end 'conditions' 630 ], # end 'conditions'
628 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 631 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
629 'xcode_settings': { 632 'xcode_settings': {
630 'SYMROOT': '<(DEPTH)/xcodebuild', 633 'SYMROOT': '<(DEPTH)/xcodebuild',
631 }, 634 },
632 } 635 }
OLDNEW
« no previous file with comments | « gyp/common.gypi ('k') | include/views/SkOSWindow_Mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698