diff options
author | Refael Ackermann <refack@gmail.com> | 2019-04-06 21:22:45 +0300 |
---|---|---|
committer | Refael Ackermann <refack@gmail.com> | 2019-04-12 21:12:40 +0300 |
commit | 25df3c10f4a54d04e0391d6b9673059f6a7918bd (patch) | |
tree | 0121301f5a77d3e833f728544c55e2f4f3c41988 /node.gypi | |
parent | 7b854959e79a1ae4cb325123ba118b83a619aaea (diff) |
build,win: put all compilation artifacts into `out`
* Add symlink from Release to out\Release for backward compat
PR-URL: https://github.com/nodejs/node/pull/27149
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'node.gypi')
-rw-r--r-- | node.gypi | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/node.gypi b/node.gypi index b53ccfd6beb..d6c4c266983 100644 --- a/node.gypi +++ b/node.gypi @@ -24,36 +24,20 @@ }, 'force_load%': '<(force_load)', }, - # Putting these explicitly here so not to be dependant on common.gypi. - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], - 'xcode_settings': { - 'WARNING_CFLAGS': [ - '-Wall', - '-Wendif-labels', - '-W', - '-Wno-unused-parameter', - '-Werror=undefined-inline', - ], - }, - # Relevant only for x86. - # Refs: https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers - 'msvs_settings': { - 'VCLinkerTool': { - 'ImageHasSafeExceptionHandlers': 'false', - }, - }, + 'conditions': [ [ 'clang==1', { 'cflags': [ '-Werror=undefined-inline', ] }], - [ 'node_shared=="false"', { + [ 'node_shared=="false" and "<(_type)"=="executable"', { 'msvs_settings': { 'VCManifestTool': { 'EmbedManifest': 'true', 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest' } }, - }, { + }], + [ 'node_shared=="true"', { 'defines': [ 'NODE_SHARED_MODE', ], |