AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partial revert of https://codereview.chromium.org/1738913002/ (Enable RAW codec for Windows)

Browse Source 
This un-breaks the MSVC 2015 build.

Review URL: https://codereview.chromium.org/1753243003
This commit is contained in:
robertphillips 2016-03-02 08:16:32 -08:00 committed by Commit bot
parent f55c364485
commit 40ee60cee1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gyp/common_variables.gypi
View File

@ -53,15 +53,19 @@
'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,