diff --git a/common.gypi b/common.gypi index 9dd0ead9c6fe..a323a1a85214 100644 --- a/common.gypi +++ b/common.gypi @@ -9,7 +9,43 @@ }], ], }, + # Settings to compile node under Windows. + 'target_defaults': { + 'target_conditions': [ + ['_target_name in ["libuv", "cares", "openssl", "node", "zlib"]', { + 'msvs_disabled_warnings': [ + 4013, # 'free' undefined; assuming extern returning int + 4054, # + 4057, # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *' + 4189, # + 4131, # uses old-style declarator + 4133, # incompatible types + 4152, # function/data pointer conversion in expression + 4206, # translation unit is empty + 4204, # non-constant aggregate initializer + 4389, # '==' : signed/unsigned mismatch + 4505, # unreferenced local function has been removed + 4701, # potentially uninitialized local variable 'sizew' used + 4706, # assignment within conditional expression + 4996, # + ], + 'msvs_settings': { + 'VCCLCompilerTool': { + 'WarnAsError': 'false', + }, + }, + }], + ], + 'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail. + 'msvs_disabled_warnings': [ + 4005, # (node.h) macro redefinition + 4201, # (uv.h) nameless struct/union + 4800, # (v8.h) forcing value to bool 'true' or 'false' + 4819, # The file contains a character that cannot be represented in the current code page + ], + }, 'conditions': [ + # Settings to compile with clang under OS X. ['clang==1', { 'make_global_settings': [ ['CC', '/usr/bin/clang'], diff --git a/vendor/node b/vendor/node index 1f85e7fa2d66..60442e249c69 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit 1f85e7fa2d66522ce145dd76cf3a4b6eb62a802d +Subproject commit 60442e249c697c13782c257cc63ae8038573c721