Chromium Code Reviews| Index: gyp/codec.gyp |
| diff --git a/gyp/codec.gyp b/gyp/codec.gyp |
| index 109c21637df5c4d226fc0481cdf1274a7a1e5610..6fb4a5355f5875564c950f29a6b1ade2becb1a45 100644 |
| --- a/gyp/codec.gyp |
| +++ b/gyp/codec.gyp |
| @@ -17,6 +17,7 @@ |
| 'standalone_static_library': 1, |
| 'dependencies': [ |
| 'core.gyp:*', |
| + 'raw_codec', |
| 'giflib.gyp:giflib', |
| 'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
| 'libpng.gyp:libpng', |
| @@ -63,6 +64,49 @@ |
| 'defines': [ |
| 'TURBO_HAS_SKIP', |
| ], |
| + }, { |
| + 'target_name': 'raw_codec', |
| + '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', |
| + '-DSK_CODEC_DECODES_RAW', |
|
scroggo
2016/01/07 20:57:42
This is a step in the right direction. But it does
yujieqin
2016/01/08 14:00:12
So we can postpone the change you mentioned for no
scroggo
2016/01/08 17:12:25
You mean the change to factor out the exceptions?
yujieqin
2016/01/11 14:03:07
We define the variable "skia_codec_decodes_raw" in
|
| + ], |
| + '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', |
| + ], |
| + 'cflags':[ |
|
msarett
2016/01/07 16:39:11
IIUC, cflags is not respected on all platforms (ma
yujieqin
2016/01/08 14:00:12
Done.
|
| + '-DSK_CODEC_DECODES_RAW', |
| + ], |
| + }, |
| + 'defines': [ |
| + 'TURBO_HAS_SKIP', |
| + ], |
| + 'conditions': [ |
| + ['OS == "ios" or OS == "mac"', { |
| + 'xcode_settings': { |
| + 'OTHER_CFLAGS': ['-fexceptions'], |
| + 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], |
| + }, |
| + }], |
| + ], |
| }, |
| ], |
| } |