diff options
| author |  yujieqin <yujieqin@google.com> | 2016-01-27 08:25:53 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-27 08:25:53 -0800 |
| commit | 076d83d09a5717913cfecabac0440b6c854ca86d (patch) | |
| tree | 74fd1ef521a4f746bb83dc7bb34212443b97fff8 /gyp | |
| parent | b84b5b42c1d848aa2b87216b9bda2b8c9e5781c1 (diff) | |
Enable RAW codec for Windows
* Use new DNG SDK version from ASOP, which fixed some build issues.
* Fix SkRawCodec.
* Fix gyp files.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1641533004
Review URL: https://codereview.chromium.org/1641533004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/codec.gyp | 11 | ||||
| -rw-r--r-- | gyp/dng_sdk.gyp | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index d7272e2a7a..eb87de1faa 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -67,8 +67,8 @@ 'TURBO_HAS_SKIP', ], 'conditions': [ - # FIXME: fix the support for Windows. (Issue with _hypot in DNG SDK). - ['skia_codec_decodes_raw and skia_os != "win" and skia_os != "chromeos"', { + # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()]. + ['skia_codec_decodes_raw and skia_os != "chromeos"', { 'dependencies': [ 'raw_codec', ], @@ -89,6 +89,13 @@ 'cflags':[ '-fexceptions', ], + 'msvs_settings': { + 'VCCLCompilerTool': { + # Need this because we are handling exception in SkRawCodec, which will trigger warning + # C4530. Add this flag as suggested by the compiler. + 'AdditionalOptions': ['/EHsc', ], + }, + }, 'include_dirs': [ '../include/codec', '../include/private', diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index 14a5b58f56..455990ba3d 100644 --- a/gyp/dng_sdk.gyp +++ b/gyp/dng_sdk.gyp @@ -29,6 +29,7 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '0', + 'AdditionalOptions': ['/wd4189', ], }, }, 'xcode_settings': { |