From 5237e374c99a9a9dbf666dbd7a6f99530b2126d3 Mon Sep 17 00:00:00 2001 From: Toyo Li Date: Fri, 26 Jan 2024 22:49:38 +0800 Subject: [PATCH 1/2] feat: define `common_gypi_dir` when running node-gyp configure --- lib/configure.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/configure.js b/lib/configure.js index 8da41a849d..d58c92a2ed 100644 --- a/lib/configure.js +++ b/lib/configure.js @@ -220,8 +220,13 @@ async function configure (gyp, argv) { !gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)', release.name + '.lib') + let commonGypiDir = path.dirname(commonGypi) + if (win) { + commonGypiDir = commonGypiDir.replace(/\\/g, '\\\\') + } argv.push('-I', addonGypi) argv.push('-I', commonGypi) + argv.push('-Dcommon_gypi_dir=' + commonGypiDir) argv.push('-Dlibrary=shared_library') argv.push('-Dvisibility=default') argv.push('-Dnode_root_dir=' + nodeDir) From 5ed7d52bb56e537181f284ec26695f991e97422a Mon Sep 17 00:00:00 2001 From: Toyo Li Date: Fri, 26 Jan 2024 23:26:24 +0800 Subject: [PATCH 2/2] refactor: use `/` on win --- lib/configure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configure.js b/lib/configure.js index d58c92a2ed..af26ab4936 100644 --- a/lib/configure.js +++ b/lib/configure.js @@ -222,7 +222,7 @@ async function configure (gyp, argv) { let commonGypiDir = path.dirname(commonGypi) if (win) { - commonGypiDir = commonGypiDir.replace(/\\/g, '\\\\') + commonGypiDir = commonGypiDir.replace(/\\/g, '/') } argv.push('-I', addonGypi) argv.push('-I', commonGypi)