| 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 21 matching lines...) Expand all Loading... |
| 32 'cflags': [ | 32 'cflags': [ |
| 33 '-msse2', | 33 '-msse2', |
| 34 '-mfpmath=sse', | 34 '-mfpmath=sse', |
| 35 ], | 35 ], |
| 36 }], | 36 }], |
| 37 | 37 |
| 38 [ 'skia_os == "win"', | 38 [ 'skia_os == "win"', |
| 39 { | 39 { |
| 40 'defines': [ | 40 'defines': [ |
| 41 'SK_BUILD_FOR_WIN32', | 41 'SK_BUILD_FOR_WIN32', |
| 42 'SK_NO_FLATE', # Too much of a pain to set up zlib on our bots. | |
| 43 '_CRT_SECURE_NO_WARNINGS', | 42 '_CRT_SECURE_NO_WARNINGS', |
| 44 'GR_GL_FUNCTION_TYPE=__stdcall', | 43 'GR_GL_FUNCTION_TYPE=__stdcall', |
| 45 ], | 44 ], |
| 46 'msvs_disabled_warnings': [ | 45 'msvs_disabled_warnings': [ |
| 47 4275, # An exported class was derived from a class that was not exp
orted | 46 4275, # An exported class was derived from a class that was not exp
orted |
| 48 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. | 47 4345, # This is an FYI about a behavior change from long ago. Chrom
e stifles it too. |
| 49 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. | 48 4355, # 'this' used in base member initializer list. Off by default
in newer compilers. |
| 50 ], | 49 ], |
| 51 'msvs_cygwin_shell': 0, | 50 'msvs_cygwin_shell': 0, |
| 52 'msvs_settings': { | 51 'msvs_settings': { |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d | 659 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d |
| 661 ], | 660 ], |
| 662 }], | 661 }], |
| 663 | 662 |
| 664 ], # end 'conditions' | 663 ], # end 'conditions' |
| 665 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 664 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 666 'xcode_settings': { | 665 'xcode_settings': { |
| 667 'SYMROOT': '<(DEPTH)/xcodebuild', | 666 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 668 }, | 667 }, |
| 669 } | 668 } |
| OLD | NEW |