diff options
| author |  yujieqin <yujieqin@google.com> | 2016-02-29 07:14:42 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-29 07:14:42 -0800 |
| commit | f236ee4e44662e519db4b4997eee5d2bc8543f9c (patch) | |
| tree | eabb285ab13b2b22e3beddea95dee94b1dd8476c /gyp | |
| parent | e93c17b35af5ebc16af8bb09fd5a83d61a25d879 (diff) | |
Enable RAW codec for Windows
* Fix the exception catching
* Set preprocessor differently for MSVC
BUG=skia:4889(b/26958348)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1738913002
Committed: https://skia.googlesource.com/skia/+/474e4c3dd28b67f590851321f15d9983ef7fd031
Review URL: https://codereview.chromium.org/1738913002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 10 | ||||
| -rw-r--r-- | gyp/dng_sdk.gyp | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 0688f627b9..e26939f864 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -53,19 +53,15 @@ 'skia_os%': '<(skia_os)', 'vulkan_merged_into_skia': '1', 'skia_android_framework%': 0, + # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be + # controlled by skia_codec_decodes_raw. + 'skia_codec_decodes_raw%': 1, 'conditions' : [ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { 'skia_arch_type%': 'x86_64', }, { 'skia_arch_type%': 'x86', }], - # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be - # controlled by skia_codec_decodes_raw. - ['skia_os == "win"', { - 'skia_codec_decodes_raw%' : 0, - }, { - 'skia_codec_decodes_raw%' : 1, - }], ], 'arm_version%': 0, 'arm_neon%': 0, diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp index 7655fd3885..3d426241e6 100644 --- a/gyp/dng_sdk.gyp +++ b/gyp/dng_sdk.gyp @@ -127,7 +127,16 @@ 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '0', - 'AdditionalOptions': ['/wd4189', ], + 'AdditionalOptions': [ + '/wd4189', + '/DqDNGBigEndian#0', + '/DqDNGReportErrors#0', + '/DqDNGThreadSafe#1', + '/DqDNGUseLibJPEG#1', + '/DqDNGUseXMP#0', + '/DqDNGValidate#0', + '/DqDNGValidateTarget#1', + ], }, }, }], |