diff options
| author | Bert Belder <bertbelder@gmail.com> | 2015-01-19 16:53:56 +0100 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-07-23 11:08:32 -0700 |
| commit | 517986c2f4098be57d2840fef2bf132acd83ccba (patch) | |
| tree | 0b94b3f88c1ededf4d93d38251e99f4646e1a1a0 | |
| parent | 10f251e8ddf5f9d2b5aeb20f0f7ebb29771158a4 (diff) | |
| download | node-517986c2f4098be57d2840fef2bf132acd83ccba.tar.gz | |
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 3122052890e838220b49794de924b323675b3b18, which itself
backports e8d08503c7821e8c92e9fa236ed7328e9bdfe62a 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 e8d08503c7821e8c92e9fa236ed7328e9bdfe62a)
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
| -rw-r--r-- | common.gypi | 20 | ||||
| -rw-r--r-- | node.gyp | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/common.gypi b/common.gypi index 31fe56699..887df4b22 100644 --- a/common.gypi +++ b/common.gypi @@ -138,8 +138,21 @@ }, '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', @@ -147,11 +160,6 @@ 'DataExecutionPrevention': 2, # enable DEP 'AllowIsolation': 'true', 'SuppressStartupBanner': 'true', - 'target_conditions': [ - ['_type=="executable"', { - 'SubSystem': 1, # console executable - }], - ], }, }, 'conditions': [ @@ -324,11 +324,6 @@ ], }], ], - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': 1, # /subsystem:console - }, - }, }, # generate ETW header and resource files { |