Index: pylib/gyp/msvs_emulation.py |
diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py |
index 3ac153dd862b40bf470e57f56238af33e81cf1a8..5f6363a862f5a110850cfee06caf4c4bb195c490 100644 |
--- a/pylib/gyp/msvs_emulation.py |
+++ b/pylib/gyp/msvs_emulation.py |
@@ -466,7 +466,17 @@ class MsvsSettings(object): |
else '/MAP'}) |
ld('MapExports', map={'true': '/MAPINFO:EXPORTS'}) |
ld('AdditionalOptions', prefix='') |
- ld('SubSystem', map={'1': 'CONSOLE', '2': 'WINDOWS'}, prefix='/SUBSYSTEM:') |
+ |
+ xp_version = '' |
+ # If we're targeting x86, make sure we're targeting XP. |
+ if self._Setting(('VCLinkerTool', 'TargetMachine'), |
+ config, default='1') == '1': |
+ xp_version = ',5.01' |
+ ld('SubSystem', |
+ map={'1': 'CONSOLE%s' % xp_version, |
+ '2': 'WINDOWS%s' % xp_version}, |
+ prefix='/SUBSYSTEM:') |
+ |
ld('TerminalServerAware', map={'1': ':NO', '2': ''}, prefix='/TSAWARE') |
ld('LinkIncremental', map={'1': ':NO', '2': ''}, prefix='/INCREMENTAL') |
ld('FixedBaseAddress', map={'1': ':NO', '2': ''}, prefix='/FIXED') |