Browse Source

win: backport bringing back xp/2k3 support

Issue: https://github.com/joyent/node/issues/25348
The gyp/project files don't explicitly specify a subsystem version,
which results in the default being used. The default changed from
VS 2010 to VS 2012 and later.

Backport 3122052890, which itself
backports e8d08503c7 from io.js.
Original commit message follows:

  Chrome still runs on Windows XP, so there is no reason that iojs
  couldn't.

  PR: https://github.com/iojs/io.js/pull/512
  (cherry picked from commit e8d08503c7)

  Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  PR-URL: https://github.com/joyent/node/pull/25367

Conflicts:
	node.gyp

Reviewed-By: João Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25569
v0.10
Bert Belder 10 years ago
committed by Julien Gilli
parent
commit
517986c2f4
  1. 20
      common.gypi
  2. 5
      node.gyp

20
common.gypi

@ -138,8 +138,21 @@
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'conditions': [ 'conditions': [
['target_arch=="ia32"', {
'TargetMachine' : 1, # /MACHINE:X86
'target_conditions': [
['_type=="executable"', {
'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
}],
],
}],
['target_arch=="x64"', { ['target_arch=="x64"', {
'TargetMachine' : 17 # /MACHINE:X64 'TargetMachine' : 17, # /MACHINE:AMD64
'target_conditions': [
['_type=="executable"', {
'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
}],
],
}], }],
], ],
'GenerateDebugInformation': 'true', 'GenerateDebugInformation': 'true',
@ -147,11 +160,6 @@
'DataExecutionPrevention': 2, # enable DEP 'DataExecutionPrevention': 2, # enable DEP
'AllowIsolation': 'true', 'AllowIsolation': 'true',
'SuppressStartupBanner': 'true', 'SuppressStartupBanner': 'true',
'target_conditions': [
['_type=="executable"', {
'SubSystem': 1, # console executable
}],
],
}, },
}, },
'conditions': [ 'conditions': [

5
node.gyp

@ -324,11 +324,6 @@
], ],
}], }],
], ],
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': 1, # /subsystem:console
},
},
}, },
# generate ETW header and resource files # generate ETW header and resource files
{ {

Loading…
Cancel
Save