From 1318e7eae1202dc8ebc22754fc970f2c020fff0c Mon Sep 17 00:00:00 2001
From: Stjepan Rajko <stjepanr@axosoft.com>
Date: Fri, 23 Sep 2016 17:44:45 -0700
Subject: [PATCH 1/2] Fix application of /EHsc option

---
 generate/templates/templates/binding.gyp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index ccf254965..2d2ded59a 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -72,12 +72,16 @@
         ],
         [
           "OS=='win'", {
-            "cflags": [
-              "/EHsc"
-            ],
             "defines": [
               "_HAS_EXCEPTIONS=1"
             ],
+            "msvs_settings": {
+              "VCCLCompilerTool": {
+                "AdditionalOptions": [
+                  "/EHsc"
+                ]
+              }
+            },
             "configurations": {
               "Debug": {
                 "msvs_settings": {

From e3d58995c05a89af0e701daaba07ee167ba5130a Mon Sep 17 00:00:00 2001
From: Stjepan Rajko <stjepanr@axosoft.com>
Date: Fri, 23 Sep 2016 18:00:07 -0700
Subject: [PATCH 2/2] Pull in identical settings to shared section

---
 generate/templates/templates/binding.gyp | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index 2d2ded59a..457221dcd 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -80,26 +80,11 @@
                 "AdditionalOptions": [
                   "/EHsc"
                 ]
-              }
-            },
-            "configurations": {
-              "Debug": {
-                "msvs_settings": {
-                  "VCLinkerTool": {
-                    "AdditionalOptions": [
-                      "/FORCE:MULTIPLE"
-                    ]
-                  }
-                }
               },
-              "Release": {
-                "msvs_settings": {
-                  "VCLinkerTool": {
-                    "AdditionalOptions": [
-                      "/FORCE:MULTIPLE"
-                    ]
-                  }
-                }
+              "VCLinkerTool": {
+                "AdditionalOptions": [
+                  "/FORCE:MULTIPLE"
+                ]
               }
             }
           }