aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-14 17:10:09 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-14 17:10:09 +0000
commit5a6c2d8208ab9ca4f6a578545a2a282b4f27e593 (patch)
treed2ba261fb298f1f4d06dd6ef559c693e976ce873 /gyp
parent8e990eb440e0f61386ba21b06b8428d5b285c341 (diff)
Add skia_exceptinos gyp define
R=robertphillips@google.com Author: borenet@google.com Review URL: https://chromiumcodereview.appspot.com/17094003 git-svn-id: http://skia.googlecode.com/svn/trunk@9615 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi9
-rw-r--r--gyp/common_variables.gypi1
2 files changed, 10 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index cceb5562f9..cf8cbdeaa4 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -113,6 +113,15 @@
},
},
}],
+ [ 'skia_win_exceptions', {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ '/EHsc',
+ ],
+ },
+ },
+ }],
],
},
],
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 9f65b34845..9b44e41a9e 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -120,6 +120,7 @@
'skia_arch_type%': '<(skia_arch_type)',
'skia_directwrite%': '<(skia_directwrite)',
'skia_gpu%': '<(skia_gpu)',
+ 'skia_win_exceptions%': 0,
'skia_osx_sdkroot%': '<(skia_osx_sdkroot)',
'skia_profile_enabled%': '<(skia_profile_enabled)',
'skia_shared_lib%': '<(skia_shared_lib)',