From 4f8dd28f7e8fe6421a48e26a4c307793141b5a30 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Tue, 18 Jan 2011 10:44:50 -0800 Subject: [PATCH] wscript chooses win32 source files, not cpp --- src/node_child_process.cc | 8 -------- src/node_stdio.cc | 8 -------- wscript | 10 ++++++++-- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/node_child_process.cc b/src/node_child_process.cc index 3cfceaaf09..413c28266d 100644 --- a/src/node_child_process.cc +++ b/src/node_child_process.cc @@ -1,9 +1,3 @@ -#ifdef __MINGW32__ -# include -#endif - -#ifdef __POSIX__ - // Copyright 2009 Ryan Dahl #include #include @@ -503,5 +497,3 @@ int ChildProcess::Kill(int sig) { } // namespace node NODE_MODULE(node_child_process, node::ChildProcess::Initialize); - -#endif // __POSIX__ diff --git a/src/node_stdio.cc b/src/node_stdio.cc index f5af576f32..c601478d6c 100644 --- a/src/node_stdio.cc +++ b/src/node_stdio.cc @@ -1,9 +1,3 @@ -#ifdef __MINGW32__ -# include "node_stdio_win32.cc" -#endif - -#ifdef __POSIX__ - #include #include @@ -315,5 +309,3 @@ void Stdio::Initialize(v8::Handle target) { } // namespace node NODE_MODULE(node_stdio, node::Stdio::Initialize); - -#endif // __POSIX__ diff --git a/wscript b/wscript index 8a32ce25a7..c1f8781c79 100644 --- a/wscript +++ b/wscript @@ -619,18 +619,24 @@ def build(bld): src/node_http_parser.cc src/node_net.cc src/node_io_watcher.cc - src/node_child_process.cc src/node_constants.cc src/node_cares.cc src/node_events.cc src/node_file.cc src/node_signal_watcher.cc src/node_stat_watcher.cc - src/node_stdio.cc src/node_timer.cc src/node_script.cc src/node_os.cc """ + + if sys.platform.startswith("win32"): + node.source += " src/node_stdio_win32.cc " + node.source += " src/node_child_process_win32.cc " + else: + node.source += " src/node_stdio.cc " + node.source += " src/node_child_process.cc " + node.source += bld.env["PLATFORM_FILE"] if not product_type_is_lib: node.source = 'src/node_main.cc '+node.source