Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-gyp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c307b30
Choose a base ref
...
head repository: nodejs/node-gyp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 386746c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 15, 2017

  1. build, win: use target_arch to link with node.lib 

    Using `target_arch` in addon.gypi to link against Node.js library. This
variable was written into build/config.gypi on the `configure` stage.

Do not copy node.lib into node_root_dir/Release or node_root_dir/Debug
on Windows, link it from node_root_dir/target_arch directory.

PR-URL: #964
Reviewed-By: João Reis <[email protected]>
    @pmed @joaocgreis
    pmed authored and joaocgreis committed May 15, 2017
    Configuration menu
    Copy the full SHA
    0913b2d View commit details
    Browse the repository at this point in the history

  2. configure: use full path in node_lib_file GYP var 

    Set path to node lib in `$(Configuration)` dir when `--nodedir` option
is supplied, otherwise use value of `target_arch` variable.

PR-URL: #964
Reviewed-By: João Reis <[email protected]>
    @pmed @joaocgreis
    pmed authored and joaocgreis committed May 15, 2017
    Configuration menu
    Copy the full SHA
    386746c View commit details
    Browse the repository at this point in the history
Loading