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

Side by Side Diff: pylib/gyp/generator/ninja.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | pylib/gyp/msvs_emulation.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import gyp 6 import gyp
7 import gyp.common 7 import gyp.common
8 import gyp.msvs_emulation 8 import gyp.msvs_emulation
9 import gyp.MSVSVersion 9 import gyp.MSVSVersion
10 import gyp.system_test 10 import gyp.system_test
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 extra_defines = [] 661 extra_defines = []
662 if self.flavor == 'mac': 662 if self.flavor == 'mac':
663 cflags = self.xcode_settings.GetCflags(config_name) 663 cflags = self.xcode_settings.GetCflags(config_name)
664 cflags_c = self.xcode_settings.GetCflagsC(config_name) 664 cflags_c = self.xcode_settings.GetCflagsC(config_name)
665 cflags_cc = self.xcode_settings.GetCflagsCC(config_name) 665 cflags_cc = self.xcode_settings.GetCflagsCC(config_name)
666 cflags_objc = ['$cflags_c'] + \ 666 cflags_objc = ['$cflags_c'] + \
667 self.xcode_settings.GetCflagsObjC(config_name) 667 self.xcode_settings.GetCflagsObjC(config_name)
668 cflags_objcc = ['$cflags_cc'] + \ 668 cflags_objcc = ['$cflags_cc'] + \
669 self.xcode_settings.GetCflagsObjCC(config_name) 669 self.xcode_settings.GetCflagsObjCC(config_name)
670 elif self.flavor == 'win': 670 elif self.flavor == 'win':
671 cflags = self.msvs_settings.GetCflags(config_name) 671 cflags = self.msvs_settings.GetCflags(config_name, self.GypPathToNinja)
672 cflags_c = self.msvs_settings.GetCflagsC(config_name) 672 cflags_c = self.msvs_settings.GetCflagsC(config_name)
673 cflags_cc = self.msvs_settings.GetCflagsCC(config_name) 673 cflags_cc = self.msvs_settings.GetCflagsCC(config_name)
674 extra_defines = self.msvs_settings.GetComputedDefines(config_name) 674 extra_defines = self.msvs_settings.GetComputedDefines(config_name)
675 self.WriteVariableList('pdbname', [self.name + '.pdb']) 675 self.WriteVariableList('pdbname', [self.name + '.pdb'])
676 else: 676 else:
677 cflags = config.get('cflags', []) 677 cflags = config.get('cflags', [])
678 cflags_c = config.get('cflags_c', []) 678 cflags_c = config.get('cflags_c', [])
679 cflags_cc = config.get('cflags_cc', []) 679 cflags_cc = config.get('cflags_cc', [])
680 680
681 defines = config.get('defines', []) + extra_defines 681 defines = config.get('defines', []) + extra_defines
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 1489
1490 user_config = params.get('generator_flags', {}).get('config', None) 1490 user_config = params.get('generator_flags', {}).get('config', None)
1491 if user_config: 1491 if user_config:
1492 GenerateOutputForConfig(target_list, target_dicts, data, params, 1492 GenerateOutputForConfig(target_list, target_dicts, data, params,
1493 user_config) 1493 user_config)
1494 else: 1494 else:
1495 config_names = target_dicts[target_list[0]]['configurations'].keys() 1495 config_names = target_dicts[target_list[0]]['configurations'].keys()
1496 for config_name in config_names: 1496 for config_name in config_names:
1497 GenerateOutputForConfig(target_list, target_dicts, data, params, 1497 GenerateOutputForConfig(target_list, target_dicts, data, params,
1498 config_name) 1498 config_name)
OLDNEW
« no previous file with comments | « no previous file | pylib/gyp/msvs_emulation.py » ('j') | pylib/gyp/msvs_emulation.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698