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

Unified Diff: pylib/gyp/msvs_emulation.py

Issue 10389225: ninja windows: support and test for AdditionalIncludeDirectories (Closed) Base URL: https://gyp.googlecode.com/svn/trunk
Patch Set: Created 8 years, 7 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
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/win/compiler-flags/additional-include-dirs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/msvs_emulation.py
diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py
index 967c6d98eda79469e40f030b75c5414cd76322ff..081f14cda491281413a056eeda38c61c75f200da 100644
--- a/pylib/gyp/msvs_emulation.py
+++ b/pylib/gyp/msvs_emulation.py
@@ -244,7 +244,7 @@ class MsvsSettings(object):
output_file = expand_special(self.ConvertVSMacros(output_file))
return output_file
- def GetCflags(self, config):
+ def GetCflags(self, config, gyp_to_build_path):
"""Returns the flags that need to be added to .c and .cc compilations."""
cflags = []
cflags.extend(['/wd' + w for w in self.msvs_disabled_warnings[config]])
@@ -268,6 +268,7 @@ class MsvsSettings(object):
cl('RuntimeLibrary',
map={'0': 'T', '1': 'Td', '2': 'D', '3': 'Dd'}, prefix='/M')
cl('ExceptionHandling', map={'1': 'sc','2': 'a'}, prefix='/EH')
+ cl('AdditionalIncludeDirectories', prefix='/I', map=gyp_to_build_path)
Nico 2012/05/23 20:38:33 I would've expected that in AdjustIncludeDirs, but
cl('AdditionalOptions', prefix='')
# ninja handles parallelism by itself, don't have the compiler do it too.
cflags = filter(lambda x: not x.startswith('/MP'), cflags)
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/win/compiler-flags/additional-include-dirs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698