Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: pylib/gyp/msvs_emulation.py

Issue 10228016: ninja windows: fix expansion of some VS macros (Closed) Base URL: https://gyp.googlecode.com/svn/trunk
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pylib/gyp/msvs_emulation.py
diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py
index 3229a661e403c66de5e2c2b1d495c5a29735855f..efb99c12c0ca75729ef29d4524426c763dfc4c45 100644
--- a/pylib/gyp/msvs_emulation.py
+++ b/pylib/gyp/msvs_emulation.py
@@ -308,9 +308,9 @@ class MsvsSettings(object):
ldflags.extend(self._GetAdditionalLibraryDirectories(
'VCLinkerTool', config, gyp_to_build_path))
ld('DelayLoadDLLs', prefix='/DELAYLOAD:')
- out = self._Setting(('VCLinkerTool', 'OutputFile'), config, prefix='/OUT:')
+ out = self._Setting(('VCLinkerTool', 'OutputFile'), config)
if out:
- ldflags.append(self.ConvertVSMacros(out))
+ ldflags.append('/OUT:' + gyp_to_build_path(self.ConvertVSMacros(out)))
ld('AdditionalOptions', prefix='')
ld('SubSystem', map={'1': 'CONSOLE', '2': 'WINDOWS'}, prefix='/SUBSYSTEM:')
ld('LinkIncremental', map={'1': ':NO', '2': ''}, prefix='/INCREMENTAL')
@@ -411,7 +411,7 @@ class MsvsSettings(object):
proxy = midl('ProxyFileName', default='${root}_p.c')
# Note that .tlb is not included in the outputs as it is not always
# generated depending on the content of the input idl file.
- outdir = midl('OutputDirectory')
+ outdir = midl('OutputDirectory', '')
output = [header, dlldata, iid, proxy]
variables = [('tlb', tlb),
('h', header),
@@ -433,7 +433,7 @@ def GetVSVersion(generator_flags):
def _GetBinaryPath(generator_flags, tool):
vs = GetVSVersion(generator_flags)
return ('"' +
- os.path.normpath(os.path.join(vs.Path(), "VC/bin", tool)) +
+ os.path.normpath(os.path.join(vs.Path(), "VC/bin", tool)).lower() +
'"')
def GetCLPath(generator_flags):

Powered by Google App Engine
This is Rietveld 408576698