| OLD | NEW |
| 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 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 6 # | 7 # |
| 7 { | 8 { |
| 8 'defines': [ | 9 'defines': [ |
| 9 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| 10 'SK_SUPPORT_GPU=<(skia_gpu)', | 11 'SK_SUPPORT_GPU=<(skia_gpu)', |
| 11 'SK_SUPPORT_OPENCL=<(skia_opencl)', | 12 'SK_SUPPORT_OPENCL=<(skia_opencl)', |
| 12 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', | 13 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', |
| 13 ], | 14 ], |
| 14 'conditions' : [ | 15 'conditions' : [ |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 | 223 |
| 223 '-Wno-unused-parameter', | 224 '-Wno-unused-parameter', |
| 224 ], | 225 ], |
| 225 'cflags_cc': [ | 226 'cflags_cc': [ |
| 226 '-std=c++11', | 227 '-std=c++11', |
| 227 '-fno-rtti', | 228 '-fno-rtti', |
| 228 '-Wnon-virtual-dtor', | 229 '-Wnon-virtual-dtor', |
| 229 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. | 230 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. |
| 230 ], | 231 ], |
| 231 'conditions': [ | 232 'conditions': [ |
| 233 [ 'skia_fast', { 'cflags': [ '<@(skia_fast_flags)' ] }], |
| 232 [ 'skia_os != "chromeos"', { | 234 [ 'skia_os != "chromeos"', { |
| 233 'conditions': [ | 235 'conditions': [ |
| 234 [ 'skia_arch_type == "x86_64" and not skia_android_framework', { | 236 [ 'skia_arch_type == "x86_64" and not skia_android_framework', { |
| 235 'cflags': [ | 237 'cflags': [ |
| 236 '-m64', | 238 '-m64', |
| 237 ], | 239 ], |
| 238 'ldflags': [ | 240 'ldflags': [ |
| 239 '-m64', | 241 '-m64', |
| 240 ], | 242 ], |
| 241 }], | 243 }], |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 'Debug': { | 524 'Debug': { |
| 523 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' }, | 525 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '0' }, |
| 524 }, | 526 }, |
| 525 'Release': { | 527 'Release': { |
| 526 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimi
zation_level)', }, | 528 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimi
zation_level)', }, |
| 527 'defines': [ 'NDEBUG' ], | 529 'defines': [ 'NDEBUG' ], |
| 528 }, | 530 }, |
| 529 }, | 531 }, |
| 530 'xcode_settings': { | 532 'xcode_settings': { |
| 531 'conditions': [ | 533 'conditions': [ |
| 534 [ 'skia_fast', { 'WARNING_CFLAGS': [ '<@(skia_fast_flags)' ] } ], |
| 532 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'
}], | 535 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'
}], |
| 533 [ 'skia_arch_width == 32', { 'ARCHS': ['i386'] }], | 536 [ 'skia_arch_width == 32', { 'ARCHS': ['i386'] }], |
| 534 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], | 537 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], |
| 535 [ 'skia_osx_deployment_target==""', { | 538 [ 'skia_osx_deployment_target==""', { |
| 536 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. | 539 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. |
| 537 }, { | 540 }, { |
| 538 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', | 541 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', |
| 539 }], | 542 }], |
| 540 ], | 543 ], |
| 541 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 544 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 662 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d | 665 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d |
| 663 ], | 666 ], |
| 664 }], | 667 }], |
| 665 | 668 |
| 666 ], # end 'conditions' | 669 ], # end 'conditions' |
| 667 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 670 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 668 'xcode_settings': { | 671 'xcode_settings': { |
| 669 'SYMROOT': '<(DEPTH)/xcodebuild', | 672 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 670 }, | 673 }, |
| 671 } | 674 } |
| OLD | NEW |