Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 3122052

Browse files
piscisaureusJulien Gilli
authored and
Julien Gilli
committed
win: bring back xp/2k3 support
Issue: #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 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 <[email protected]> PR-URL: #25367
1 parent e23450f commit 3122052

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

common.gypi

+14-6
Original file line numberDiff line numberDiff line change
@@ -135,20 +135,28 @@
135135
},
136136
'VCLinkerTool': {
137137
'conditions': [
138+
['target_arch=="ia32"', {
139+
'TargetMachine' : 1, # /MACHINE:X86
140+
'target_conditions': [
141+
['_type=="executable"', {
142+
'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
143+
}],
144+
],
145+
}],
138146
['target_arch=="x64"', {
139-
'TargetMachine' : 17 # /MACHINE:X64
147+
'TargetMachine' : 17, # /MACHINE:AMD64
148+
'target_conditions': [
149+
['_type=="executable"', {
150+
'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
151+
}],
152+
],
140153
}],
141154
],
142155
'GenerateDebugInformation': 'true',
143156
'RandomizedBaseAddress': 2, # enable ASLR
144157
'DataExecutionPrevention': 2, # enable DEP
145158
'AllowIsolation': 'true',
146159
'SuppressStartupBanner': 'true',
147-
'target_conditions': [
148-
['_type=="executable"', {
149-
'SubSystem': 1, # console executable
150-
}],
151-
],
152160
},
153161
},
154162
'msvs_disabled_warnings': [4351, 4355, 4800],

node.gyp

-3
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@
378378
}],
379379
],
380380
'msvs_settings': {
381-
'VCLinkerTool': {
382-
'SubSystem': 1, # /subsystem:console
383-
},
384381
'VCManifestTool': {
385382
'EmbedManifest': 'true',
386383
'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest'

0 commit comments

Comments
 (0)