From 9a2637e8d81bce8378a28e1da44ee73380869f4b Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 27 May 2015 12:02:06 +0800 Subject: [PATCH] Setting NODE_GYP_DIR for addon.gypi to setting absolute path for src/win_delay_load_hook.c, and fixes of the long relative path issue on Win32. Fixes of #636 --- addon.gypi | 2 +- lib/configure.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addon.gypi b/addon.gypi index 7f6264ac61..3377942421 100644 --- a/addon.gypi +++ b/addon.gypi @@ -40,7 +40,7 @@ 'conditions': [ [ 'OS=="win"', { 'sources': [ - 'src/win_delay_load_hook.c', + '<(node_gyp_dir)/src/win_delay_load_hook.c', ], 'msvs_settings': { 'VCLinkerTool': { diff --git a/lib/configure.js b/lib/configure.js index 0a33e70088..e8c2029b59 100644 --- a/lib/configure.js +++ b/lib/configure.js @@ -316,12 +316,14 @@ function configure (gyp, argv, callback) { // Windows expects an absolute path output_dir = buildDir } + var nodeGypDir = path.resolve(__dirname, '..') argv.push('-I', addon_gypi) argv.push('-I', common_gypi) argv.push('-Dlibrary=shared_library') argv.push('-Dvisibility=default') argv.push('-Dnode_root_dir=' + nodeDir) + argv.push('-Dnode_gyp_dir=' + nodeGypDir) argv.push('-Dmodule_root_dir=' + process.cwd()) argv.push('--depth=.') argv.push('--no-parallel')