From b9d777734d0db37f3f38e5996bc62e0dbf9482c0 Mon Sep 17 00:00:00 2001 From: Peter Bright Date: Thu, 11 Aug 2011 02:45:56 +0100 Subject: [PATCH] Fix MSVS building. --- generate-projects.bat | 2 +- node.gyp | 2 +- src/node.cc | 8 +++----- tools/gyp_node | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/generate-projects.bat b/generate-projects.bat index 744d83898a..0dbea2b3d0 100644 --- a/generate-projects.bat +++ b/generate-projects.bat @@ -1,2 +1,2 @@ @echo off -python tools\gyp_node -f msvs -D msvs_multi_core_compile=true +python tools\gyp_node -f msvs -G msvs_version=2010 -D msvs_multi_core_compile=true diff --git a/node.gyp b/node.gyp index 8a4d7e76a6..0ca31d5d2e 100644 --- a/node.gyp +++ b/node.gyp @@ -74,7 +74,7 @@ 'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser', 'deps/v8/tools/gyp/v8.gyp:v8', - 'deps/uv/build/all.gyp:uv', + 'deps/uv/all.gyp:uv', 'node_js2c#host', ], diff --git a/src/node.cc b/src/node.cc index 7f6859bd16..1e69114fef 100644 --- a/src/node.cc +++ b/src/node.cc @@ -49,6 +49,9 @@ #define getcwd _getcwd #include #define getpid _getpid +#include +#define umask _umask +typedef int mode_t; #endif #include #include @@ -1443,11 +1446,6 @@ static Handle Cwd(const Arguments& args) { return scope.Close(cwd); } - -#ifndef __POSIX__ -# define umask _umask -#endif - static Handle Umask(const Arguments& args) { HandleScope scope; unsigned int old; diff --git a/tools/gyp_node b/tools/gyp_node index f38aa7169d..d783b1dba5 100755 --- a/tools/gyp_node +++ b/tools/gyp_node @@ -42,7 +42,6 @@ if __name__ == '__main__': # Tell make to write its output into the same dir args.extend(['-Goutput_dir=' + output_dir]) - args.append('-S-nodegyp') args.append('-Dtarget_arch=ia32') args.append('-Dcomponent=static_library') args.append('-Dlibrary=static_library')