Index: gyp/codec.gyp |
diff --git a/gyp/codec.gyp b/gyp/codec.gyp |
index 109c21637df5c4d226fc0481cdf1274a7a1e5610..b9a55c145dceaf0dd8bce1b3ffd7886c06cfa27c 100644 |
--- a/gyp/codec.gyp |
+++ b/gyp/codec.gyp |
@@ -17,15 +17,18 @@ |
'standalone_static_library': 1, |
'dependencies': [ |
'core.gyp:*', |
+ 'dng_sdk.gyp:dng_sdk', |
'giflib.gyp:giflib', |
'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector', |
'libpng.gyp:libpng', |
'libwebp.gyp:libwebp', |
+ 'piex.gyp:piex', |
], |
'cflags':[ |
# FIXME: This gets around a longjmp warning. See |
# http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio |
'-Wno-clobbered -Wno-error', |
+ '-fexceptions', |
djsollen
2015/12/16 20:35:34
I think we will want to create a separate build ta
yujieqin
2016/01/06 18:47:18
Done.
|
], |
'include_dirs': [ |
'../include/codec', |
@@ -35,6 +38,7 @@ |
], |
'sources': [ |
'../src/codec/SkAndroidCodec.cpp', |
+ '../src/codec/SkAndroidRawCodec.cpp', |
'../src/codec/SkBmpCodec.cpp', |
'../src/codec/SkBmpMaskCodec.cpp', |
'../src/codec/SkBmpRLECodec.cpp', |
@@ -49,6 +53,7 @@ |
'../src/codec/SkJpegUtility_codec.cpp', |
'../src/codec/SkMaskSwizzler.cpp', |
'../src/codec/SkMasks.cpp', |
+ '../src/codec/SkRawCodec.cpp', |
'../src/codec/SkSampler.cpp', |
'../src/codec/SkSampledCodec.cpp', |
'../src/codec/SkSwizzler.cpp', |
@@ -63,6 +68,14 @@ |
'defines': [ |
'TURBO_HAS_SKIP', |
], |
+ 'conditions': [ |
+ ['OS == "ios" or OS == "mac"', { |
+ 'xcode_settings': { |
+ 'OTHER_CFLAGS': ['-fexceptions'], |
+ 'OTHER_CPLUSPLUSFLAGS': ['-fexceptions'], |
+ }, |
+ }], |
+ ], |
}, |
], |
} |