Skip to content

Commit

Permalink
win: backport bringing back xp/2k3 support
Browse files Browse the repository at this point in the history
Issue: nodejs#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 3122052, which itself
backports e8d0850 from io.js.
Original commit message follows:

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

  PR: nodejs/node#512
  (cherry picked from commit e8d0850)

  Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  PR-URL: nodejs#25367

Conflicts:
	node.gyp
  • Loading branch information
piscisaureus authored and Julien Gilli committed Jul 21, 2015
1 parent 571e103 commit 2283673
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
20 changes: 14 additions & 6 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -138,20 +138,28 @@
},
'VCLinkerTool': {
'conditions': [
['target_arch=="ia32"', {
'TargetMachine' : 1, # /MACHINE:X86
'target_conditions': [
['_type=="executable"', {
'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
}],
],
}],
['target_arch=="x64"', {
'TargetMachine' : 17 # /MACHINE:X64
'TargetMachine' : 17, # /MACHINE:AMD64
'target_conditions': [
['_type=="executable"', {
'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
}],
],
}],
],
'GenerateDebugInformation': 'true',
'RandomizedBaseAddress': 2, # enable ASLR
'DataExecutionPrevention': 2, # enable DEP
'AllowIsolation': 'true',
'SuppressStartupBanner': 'true',
'target_conditions': [
['_type=="executable"', {
'SubSystem': 1, # console executable
}],
],
},
},
'conditions': [
Expand Down
5 changes: 0 additions & 5 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,6 @@
],
}],
],
'msvs_settings': {
'VCLinkerTool': {
'SubSystem': 1, # /subsystem:console
},
},
},
# generate ETW header and resource files
{
Expand Down

0 comments on commit 2283673

Please sign in to comment.