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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1309523003: Remove SK_OFFSETOF from SkTypes, clean up offsetof usage. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Speling Created 5 years, 3 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 | include/core/SkTypes.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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 '-Winit-self', 221 '-Winit-self',
222 '-Wpointer-arith', 222 '-Wpointer-arith',
223 '-Wsign-compare', 223 '-Wsign-compare',
224 224
225 '-Wno-unused-parameter', 225 '-Wno-unused-parameter',
226 ], 226 ],
227 'cflags_cc': [ 227 'cflags_cc': [
228 '-std=c++11', 228 '-std=c++11',
229 '-fno-rtti', 229 '-fno-rtti',
230 '-Wnon-virtual-dtor', 230 '-Wnon-virtual-dtor',
231 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD.
232 ], 231 ],
233 'conditions': [ 232 'conditions': [
234 [ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }], 233 [ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }],
235 [ 'skia_os != "chromeos"', { 234 [ 'skia_os != "chromeos"', {
236 'conditions': [ 235 'conditions': [
237 [ 'skia_arch_type == "x86_64" and not skia_android_framework', { 236 [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
238 'cflags': [ 237 'cflags': [
239 '-m64', 238 '-m64',
240 ], 239 ],
241 'ldflags': [ 240 'ldflags': [
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 }, { 490 }, {
492 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', 491 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
493 }], 492 }],
494 ], 493 ],
495 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 494 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
496 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 495 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3
497 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden 496 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden
498 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden 497 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden
499 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks 498 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks
500 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings 499 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings
501 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-of fsetof
502 'WARNING_CFLAGS': [ 500 'WARNING_CFLAGS': [
503 '-Wall', 501 '-Wall',
504 '-Wextra', 502 '-Wextra',
505 '-Winit-self', 503 '-Winit-self',
506 '-Wpointer-arith', 504 '-Wpointer-arith',
507 '-Wsign-compare', 505 '-Wsign-compare',
508 506
509 '-Wno-unused-parameter', 507 '-Wno-unused-parameter',
510 ], 508 ],
511 }, 509 },
(...skipping 27 matching lines...) Expand all
539 'defines': [ 'NDEBUG' ], 537 'defines': [ 'NDEBUG' ],
540 }, 538 },
541 }, 539 },
542 'xcode_settings': { 540 'xcode_settings': {
543 'ARCHS': ['armv7'], 541 'ARCHS': ['armv7'],
544 'CODE_SIGNING_REQUIRED': 'NO', 542 'CODE_SIGNING_REQUIRED': 'NO',
545 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer: Google Develop ment (3F4Y5873JF)', 543 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer: Google Develop ment (3F4Y5873JF)',
546 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 544 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
547 'SDKROOT': 'iphoneos', 545 'SDKROOT': 'iphoneos',
548 'TARGETED_DEVICE_FAMILY': '1,2', 546 'TARGETED_DEVICE_FAMILY': '1,2',
549 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-offset of
550 'OTHER_CPLUSPLUSFLAGS': [ 547 'OTHER_CPLUSPLUSFLAGS': [
551 '-std=c++0x', 548 '-std=c++0x',
552 '-fvisibility=hidden', 549 '-fvisibility=hidden',
553 '-fvisibility-inlines-hidden', 550 '-fvisibility-inlines-hidden',
554 ], 551 ],
555 'GCC_THUMB_SUPPORT': 'NO', 552 'GCC_THUMB_SUPPORT': 'NO',
556 }, 553 },
557 }, 554 },
558 ], 555 ],
559 556
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 [ 'sknx_no_simd', { 617 [ 'sknx_no_simd', {
621 'defines': [ 'SKNX_NO_SIMD' ], 618 'defines': [ 'SKNX_NO_SIMD' ],
622 }], 619 }],
623 620
624 ], # end 'conditions' 621 ], # end 'conditions'
625 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 622 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
626 'xcode_settings': { 623 'xcode_settings': {
627 'SYMROOT': '<(DEPTH)/xcodebuild', 624 'SYMROOT': '<(DEPTH)/xcodebuild',
628 }, 625 },
629 } 626 }
OLDNEW
« no previous file with comments | « no previous file | include/core/SkTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698