From fd39568823ba2c41644df3d213cc925822cac04a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 12 Dec 2018 15:57:11 -0800
Subject: [PATCH] Apply msvs platform fix for both compiler and runtime targets

---
 project.gyp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/project.gyp b/project.gyp
index dfedfb6f..c7890373 100644
--- a/project.gyp
+++ b/project.gyp
@@ -63,9 +63,15 @@
         ],
       },
 
-      # Mac OS has an old version of libstdc++ that doesn't support c++11.
-      # libc++ is only present on 10.7 and later.
       'conditions': [
+        # For 64-bit builds on appveyor, we need to explicitly tell gyp
+        # to generate an x64 target in the MSVS project file.
+        ['"<!(echo %PLATFORM%)" == "x64"', {
+          'msvs_configuration_platform': 'x64',
+        }],
+
+        # Mac OS has an old version of libstdc++ that doesn't support c++11.
+        # libc++ is only present on 10.7 and later.
         ['OS == "mac"', {
           'cflags_cc': [ '-stdlib=libc++' ],
           'xcode_settings': {
@@ -114,6 +120,14 @@
           'include'
         ],
       },
+
+      'conditions': [
+        # For 64-bit builds on appveyor, we need to explicitly tell gyp
+        # to generate an x64 target in the MSVS project file.
+        ['"<!(echo %PLATFORM%)" == "x64"', {
+          'msvs_configuration_platform': 'x64',
+        }],
+      ],
     },
   ],
 
@@ -168,14 +182,6 @@
         '-Wextra',
         '-Wno-unused-parameter'
       ],
-    },
-
-    # For 64-bit builds on appveyor, we need to explicitly tell gyp
-    # to generate an x64 target in the MSVS project file.
-    'conditions': [
-      ['"<!(echo %PLATFORM%)" == "x64"', {
-        'msvs_configuration_platform': 'x64',
-      }]
-    ]
+    }
   }
 }