| 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_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', | |
| 9 ], | 8 ], |
| 10 'conditions' : [ | 9 'conditions' : [ |
| 11 [ 'skia_os == "win"', | 10 [ 'skia_os == "win"', |
| 12 { | 11 { |
| 13 'defines': [ | 12 'defines': [ |
| 14 'SK_BUILD_FOR_WIN32', | 13 'SK_BUILD_FOR_WIN32', |
| 15 '_CRT_SECURE_NO_WARNINGS', | 14 '_CRT_SECURE_NO_WARNINGS', |
| 16 'GR_GL_FUNCTION_TYPE=__stdcall', | 15 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 17 ], | 16 ], |
| 18 'msvs_cygwin_shell': 0, | 17 'msvs_cygwin_shell': 0, |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 'defines': [ | 529 'defines': [ |
| 531 'SK_USE_POSIX_THREADS', | 530 'SK_USE_POSIX_THREADS', |
| 532 ], | 531 ], |
| 533 }], | 532 }], |
| 534 ], # end 'conditions' | 533 ], # end 'conditions' |
| 535 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 534 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 536 'xcode_settings': { | 535 'xcode_settings': { |
| 537 'SYMROOT': '<(DEPTH)/xcodebuild', | 536 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 538 }, | 537 }, |
| 539 } | 538 } |
| OLD | NEW |