summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2013-03-04 19:58:13 +0100
committerBert Belder <bertbelder@gmail.com>2013-03-04 19:58:13 +0100
commit3a387e75369a1736d0c75dbfbb91f7d76f6209a3 (patch)
treea91853a34126200925ccfed9a05ddb51381650ad
parent890dc2eeb1bdf4a861cd3493245359238d033a12 (diff)
downloadnode-reviewme2.tar.gz
win: fix 'safeseh' issue when compiling with vs2012reviewme2
-rw-r--r--common.gypi1
-rw-r--r--deps/openssl/openssl.gyp2
2 files changed, 2 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi
index 72138f36b..9ecfc4d2a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -121,7 +121,6 @@
'WarningLevel': 3,
'BufferSecurityCheck': 'true',
'ExceptionHandling': 1, # /EHsc
- 'ImageHasSafeExceptionHandlers': 0, # /SAFESEH:NO
'SuppressStartupBanner': 'true',
'WarnAsError': 'false',
},
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index d3f05e6a8..c8099597b 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -826,6 +826,7 @@
'/Zi',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
+ 'safeseh'
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
@@ -869,6 +870,7 @@
'/Zi',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
+ '/safeseh'
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',