| OLD | NEW |
| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 'conditions': [ | 523 'conditions': [ |
| 524 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'
}], | 524 [ 'skia_warnings_as_errors', { 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES'
}], |
| 525 [ 'skia_arch_width == 32', { 'ARCHS': ['i386'] }], | 525 [ 'skia_arch_width == 32', { 'ARCHS': ['i386'] }], |
| 526 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], | 526 [ 'skia_arch_width == 64', { 'ARCHS': ['x86_64'] }], |
| 527 [ 'skia_osx_deployment_target==""', { | 527 [ 'skia_osx_deployment_target==""', { |
| 528 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. | 528 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed
in env to ld. |
| 529 }, { | 529 }, { |
| 530 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', | 530 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)', |
| 531 }], | 531 }], |
| 532 ], | 532 ], |
| 533 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| 533 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 | 534 'GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS': 'YES', # -mssse3 |
| 534 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi
dden | 535 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # -fvisibility=hi
dden |
| 535 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in
lines-hidden | 536 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'NO', # -fvisibility-in
lines-hidden |
| 536 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl
ocks | 537 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl
ocks |
| 537 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal
-strings | 538 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal
-strings |
| 538 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-of
fsetof | 539 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', # -Wno-invalid-of
fsetof |
| 539 'WARNING_CFLAGS': [ | 540 'WARNING_CFLAGS': [ |
| 540 '-Wall', | 541 '-Wall', |
| 541 '-Wextra', | 542 '-Wextra', |
| 542 '-Winit-self', | 543 '-Winit-self', |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 [ 'skia_is_bot', { | 656 [ 'skia_is_bot', { |
| 656 'defines': [ 'SK_CRASH_HANDLER' ], | 657 'defines': [ 'SK_CRASH_HANDLER' ], |
| 657 }], | 658 }], |
| 658 | 659 |
| 659 ], # end 'conditions' | 660 ], # end 'conditions' |
| 660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 661 'xcode_settings': { | 662 'xcode_settings': { |
| 662 'SYMROOT': '<(DEPTH)/xcodebuild', | 663 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 663 }, | 664 }, |
| 664 } | 665 } |
| OLD | NEW |