Chromium Code Reviews| Index: gyp/codec.gyp |
| diff --git a/gyp/codec.gyp b/gyp/codec.gyp |
| index 109c21637df5c4d226fc0481cdf1274a7a1e5610..e4786b593a2a63ae84dbe31cbd40c0dedef3d332 100644 |
| --- a/gyp/codec.gyp |
| +++ b/gyp/codec.gyp |
| @@ -9,6 +9,9 @@ |
| # GYP file for codec project. |
| { |
| + 'includes': [ |
| + 'common.gypi', |
|
scroggo
2016/01/11 17:44:02
This is unnecessary. We actually include common.gy
yujieqin
2016/01/12 10:47:40
Done.
|
| + ], |
| 'targets': [ |
| { |
| 'target_name': 'codec', |
| @@ -63,6 +66,52 @@ |
| 'defines': [ |
| 'TURBO_HAS_SKIP', |
| ], |
| + 'conditions': [ |
| + ['skia_codec_decodes_raw', { |
| + 'dependencies': [ |
| + 'raw_codec', |
| + ], |
| + },], |
| + ], |
| + }, { |
| + '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', |
| + ], |
| + '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': [ |
| + 'TURBO_HAS_SKIP', |
| + ], |
| + 'conditions': [ |
| + ['OS == "ios" or OS == "mac"', { |
| + 'xcode_settings': { |
| + 'OTHER_CFLAGS': ['-fexceptions'], |
| + 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], |
| + }, |
| + }], |
| + ], |
| }, |
| ], |
| } |