Chromium Code Reviews| Index: gyp/codec.gyp |
| diff --git a/gyp/codec.gyp b/gyp/codec.gyp |
| index 109c21637df5c4d226fc0481cdf1274a7a1e5610..d7ac77a73f2d5d07a956099e97765ecf0709527a 100644 |
| --- a/gyp/codec.gyp |
| +++ b/gyp/codec.gyp |
| @@ -63,6 +63,56 @@ |
| 'defines': [ |
| 'TURBO_HAS_SKIP', |
| ], |
| + 'conditions': [ |
| + ['skia_codec_decodes_raw', { |
| + 'dependencies': [ |
| + 'raw_codec', |
| + ], |
| + },], |
| + ], |
| + }, { |
| + 'target_name': 'raw_codec', |
|
scroggo
2016/01/14 15:26:38
Please add a comment here and elsewhere (e.g. wher
yujieqin
2016/01/15 14:49:30
Comments added.
|
| + 'product_name': 'raw_codec', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + 'core.gyp:*', |
| + 'dng_sdk.gyp:dng_sdk-selector', |
| + 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
| + 'piex.gyp:piex-selector', |
| + ], |
| + 'cflags':[ |
| + '-fexceptions', |
| + ], |
| + 'include_dirs': [ |
| + '../include/codec', |
| + '../include/private', |
| + '../src/codec', |
| + '../src/core', |
| + ], |
| + 'sources': [ |
| + '../src/codec/SkRawAdapterCodec.cpp', |
| + '../src/codec/SkRawCodec.cpp', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'include_dirs': [ |
| + '../include/codec', |
| + ], |
| + 'defines': [ |
| + 'SK_CODEC_DECODES_RAW', |
| + ], |
| + }, |
| + 'defines': [ |
| + 'SK_CODEC_DECODES_RAW', |
| + 'TURBO_HAS_SKIP', |
|
scroggo
2016/01/14 15:26:38
Is this necessary here? It does not directly check
yujieqin
2016/01/15 14:49:30
Removed.
|
| + ], |
| + 'conditions': [ |
| + ['OS == "ios" or OS == "mac"', { |
| + 'xcode_settings': { |
| + 'OTHER_CFLAGS': ['-fexceptions'], |
| + 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], |
| + }, |
| + }], |
| + ], |
| }, |
| ], |
| } |