| 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 |
| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 'cflags': [ | 237 'cflags': [ |
| 238 '-g', | 238 '-g', |
| 239 '-fno-exceptions', | 239 '-fno-exceptions', |
| 240 '-fstrict-aliasing', | 240 '-fstrict-aliasing', |
| 241 | 241 |
| 242 '-Wall', | 242 '-Wall', |
| 243 '-Wextra', | 243 '-Wextra', |
| 244 '-Winit-self', | 244 '-Winit-self', |
| 245 '-Wpointer-arith', | 245 '-Wpointer-arith', |
| 246 '-Wsign-compare', | 246 '-Wsign-compare', |
| 247 '-Wvla', |
| 247 | 248 |
| 248 '-Wno-unused-parameter', | 249 '-Wno-unused-parameter', |
| 249 ], | 250 ], |
| 250 'cflags_cc': [ | 251 'cflags_cc': [ |
| 251 '-std=c++11', | 252 '-std=c++11', |
| 252 '-fno-rtti', | 253 '-fno-rtti', |
| 253 '-fno-threadsafe-statics', | 254 '-fno-threadsafe-statics', |
| 254 '-Wnon-virtual-dtor', | 255 '-Wnon-virtual-dtor', |
| 255 ], | 256 ], |
| 256 'ldflags': [ '-rdynamic' ], | 257 'ldflags': [ '-rdynamic' ], |
| (...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hi
dden | 555 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hi
dden |
| 555 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', # -fvisibility-in
lines-hidden | 556 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', # -fvisibility-in
lines-hidden |
| 556 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl
ocks | 557 'GCC_CW_ASM_SYNTAX': 'NO', # remove -fasm-bl
ocks |
| 557 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal
-strings | 558 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # remove -mpascal
-strings |
| 558 'WARNING_CFLAGS': [ | 559 'WARNING_CFLAGS': [ |
| 559 '-Wall', | 560 '-Wall', |
| 560 '-Wextra', | 561 '-Wextra', |
| 561 '-Winit-self', | 562 '-Winit-self', |
| 562 '-Wpointer-arith', | 563 '-Wpointer-arith', |
| 563 '-Wsign-compare', | 564 '-Wsign-compare', |
| 565 '-Wvla', |
| 564 | 566 |
| 565 '-Wno-unused-parameter', | 567 '-Wno-unused-parameter', |
| 566 ], | 568 ], |
| 567 }, | 569 }, |
| 568 }, | 570 }, |
| 569 ], | 571 ], |
| 570 | 572 |
| 571 [ 'skia_os == "ios"', | 573 [ 'skia_os == "ios"', |
| 572 { | 574 { |
| 573 'defines': [ | 575 'defines': [ |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 705 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 704 }, | 706 }, |
| 705 }], | 707 }], |
| 706 | 708 |
| 707 ], # end 'conditions' | 709 ], # end 'conditions' |
| 708 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 710 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 709 'xcode_settings': { | 711 'xcode_settings': { |
| 710 'SYMROOT': '<(DEPTH)/xcodebuild', | 712 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 711 }, | 713 }, |
| 712 } | 714 } |
| OLD | NEW |