From 334f03fc42b79ab2ea26326e38c7ee8aefaf6e6c Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 21 Jul 2016 16:36:50 +0900 Subject: [PATCH] Fix compilation errors on Windows --- common.gypi | 2 +- vendor/native_mate | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 0eaf3a31e991..b2ee5e50811f 100644 --- a/common.gypi +++ b/common.gypi @@ -46,7 +46,7 @@ # Settings to compile node under Windows. 'target_defaults': { 'target_conditions': [ - ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', { + ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node", "zlib"]', { 'msvs_disabled_warnings': [ 4003, # not enough actual parameters for macro 'V' 4013, # 'free' undefined; assuming extern returning int diff --git a/vendor/native_mate b/vendor/native_mate index a1efa285204c..b611cbb75f35 160000 --- a/vendor/native_mate +++ b/vendor/native_mate @@ -1 +1 @@ -Subproject commit a1efa285204cb2fbbed450c317fb535a38ea8480 +Subproject commit b611cbb75f35b89d4b7e86735432abe5ed059de3