From e8d08503c7821e8c92e9fa236ed7328e9bdfe62a Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 19 Jan 2015 16:53:56 +0100 Subject: [PATCH 1/2] win: bring back xp/2k3 support Chrome still runs on Windows XP, so there is no reason that iojs couldn't. PR: https://github.com/iojs/io.js/pull/512 Reviewed-by: Ben Noordhuis --- common.gypi | 20 ++++++++++++++------ node.gyp | 3 --- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/common.gypi b/common.gypi index 7072a83aab33e1..e323fc3a6c4dc5 100644 --- a/common.gypi +++ b/common.gypi @@ -141,8 +141,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', @@ -150,11 +163,6 @@ 'DataExecutionPrevention': 2, # enable DEP 'AllowIsolation': 'true', 'SuppressStartupBanner': 'true', - 'target_conditions': [ - ['_type=="executable"', { - 'SubSystem': 1, # console executable - }], - ], }, }, 'msvs_disabled_warnings': [4351, 4355, 4800], diff --git a/node.gyp b/node.gyp index 1063e182c8416d..2d612b61be5a1c 100644 --- a/node.gyp +++ b/node.gyp @@ -378,9 +378,6 @@ }], ], 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': 1, # /subsystem:console - }, 'VCManifestTool': { 'EmbedManifest': 'true', 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest' From 4af5746993a6b91c88973b6debcee19c6cd35185 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 19 Jan 2015 17:25:23 +0100 Subject: [PATCH 2/2] win,build: remove duplicate definition The duplicate warning was fixed by e1fe270, but returned as of 9f45799. Hopefully this will fix the issue for good. PR: https://github.com/iojs/io.js/pull/512 Reviewed-by: Ben Noordhuis --- node.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/node.gyp b/node.gyp index 2d612b61be5a1c..b00ab2937cba99 100644 --- a/node.gyp +++ b/node.gyp @@ -322,6 +322,9 @@ 'sources': [ 'src/res/node.rc', ], + 'defines!': [ + 'NODE_PLATFORM="win"', + ], 'defines': [ 'FD_SETSIZE=1024', # we need to use node's preferred "win32" rather than gyp's preferred "win"