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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1323533003: Mimic Chrome better in our GYPs. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: move to _cc 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 | no next file » | 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 '-Wextra', 220 '-Wextra',
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 '-fno-threadsafe-statics',
230 '-Wnon-virtual-dtor', 231 '-Wnon-virtual-dtor',
231 ], 232 ],
232 'conditions': [ 233 'conditions': [
233 [ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }], 234 [ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }],
234 [ 'skia_os != "chromeos"', { 235 [ 'skia_os != "chromeos"', {
235 'conditions': [ 236 'conditions': [
236 [ 'skia_arch_type == "x86_64" and not skia_android_framework', { 237 [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
237 'cflags': [ 238 'cflags': [
238 '-m64', 239 '-m64',
239 ], 240 ],
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }], 486 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES' }],
486 [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }], 487 [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }],
487 [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }], 488 [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
488 [ 'skia_osx_deployment_target==""', { 489 [ 'skia_osx_deployment_target==""', {
489 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld. 490 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
490 }, { 491 }, {
491 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', 492 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
492 }], 493 }],
493 ], 494 ],
494 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', 495 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
496 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
497 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
498 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe -statics
495 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 499 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3
496 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden 500 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi dden
497 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden 501 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in lines-hidden
498 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks 502 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl ocks
499 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings 503 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal -strings
500 'WARNING_CFLAGS': [ 504 'WARNING_CFLAGS': [
501 '-Wall', 505 '-Wall',
502 '-Wextra', 506 '-Wextra',
503 '-Winit-self', 507 '-Winit-self',
504 '-Wpointer-arith', 508 '-Wpointer-arith',
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 [ 'sknx_no_simd', { 621 [ 'sknx_no_simd', {
618 'defines': [ 'SKNX_NO_SIMD' ], 622 'defines': [ 'SKNX_NO_SIMD' ],
619 }], 623 }],
620 624
621 ], # end 'conditions' 625 ], # end 'conditions'
622 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 626 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
623 'xcode_settings': { 627 'xcode_settings': {
624 'SYMROOT': '<(DEPTH)/xcodebuild', 628 'SYMROOT': '<(DEPTH)/xcodebuild',
625 }, 629 },
626 } 630 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698