Skip to content

Commit 517986c

Browse files
piscisaureusJulien Gilli
authored and
Julien Gilli
committed
win: backport bringing back xp/2k3 support
Issue: nodejs/node-v0.x-archive#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: #512 (cherry picked from commit e8d0850) Reviewed-By: Julien Gilli <[email protected]> PR-URL: nodejs/node-v0.x-archive#25367 Conflicts: node.gyp Reviewed-By: João Reis <[email protected]> PR-URL: nodejs/node-v0.x-archive#25569
1 parent 10f251e commit 517986c

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

common.gypi

+14-6
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,28 @@
138138
},
139139
'VCLinkerTool': {
140140
'conditions': [
141+
['target_arch=="ia32"', {
142+
'TargetMachine' : 1, # /MACHINE:X86
143+
'target_conditions': [
144+
['_type=="executable"', {
145+
'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
146+
}],
147+
],
148+
}],
141149
['target_arch=="x64"', {
142-
'TargetMachine' : 17 # /MACHINE:X64
150+
'TargetMachine' : 17, # /MACHINE:AMD64
151+
'target_conditions': [
152+
['_type=="executable"', {
153+
'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
154+
}],
155+
],
143156
}],
144157
],
145158
'GenerateDebugInformation': 'true',
146159
'RandomizedBaseAddress': 2, # enable ASLR
147160
'DataExecutionPrevention': 2, # enable DEP
148161
'AllowIsolation': 'true',
149162
'SuppressStartupBanner': 'true',
150-
'target_conditions': [
151-
['_type=="executable"', {
152-
'SubSystem': 1, # console executable
153-
}],
154-
],
155163
},
156164
},
157165
'conditions': [

node.gyp

-5
Original file line numberDiff line numberDiff line change
@@ -324,11 +324,6 @@
324324
],
325325
}],
326326
],
327-
'msvs_settings': {
328-
'VCLinkerTool': {
329-
'SubSystem': 1, # /subsystem:console
330-
},
331-
},
332327
},
333328
# generate ETW header and resource files
334329
{

0 commit comments

Comments
 (0)