Chromium Code Reviews| Index: pylib/gyp/generator/xcode.py |
| =================================================================== |
| --- pylib/gyp/generator/xcode.py (revision 1630) |
| +++ pylib/gyp/generator/xcode.py (working copy) |
| @@ -1193,6 +1193,9 @@ |
| if support_xct: |
| support_xct.AddDependency(xcode_targets[dependency]) |
| + def Quote(s): |
| + return '"%s"' % s |
|
Mark Mentovai
2013/05/29 13:23:07
?
This isn’t the right way to quote something. Wh
Dimi Shahbaz
2013/05/29 21:32:41
Done.
|
| + |
| if 'libraries' in spec: |
| for library in spec['libraries']: |
| xct.FrameworksPhase().AddFile(library) |
| @@ -1211,6 +1214,12 @@ |
| xcbc.AppendBuildSetting('FRAMEWORK_SEARCH_PATHS', include_dir) |
| for include_dir in configuration.get('include_dirs', []): |
| xcbc.AppendBuildSetting('HEADER_SEARCH_PATHS', include_dir) |
| + for library_dir in configuration.get('library_dirs', []): |
| + if library_dir not in xcode_standard_library_dirs and ( |
| + not xcbc.HasBuildSetting(_library_search_paths_var) or |
| + library_dir not in xcbc.GetBuildSetting(_library_search_paths_var)): |
| + xcbc.AppendBuildSetting(_library_search_paths_var, Quote(library_dir)) |
| + |
| if 'defines' in configuration: |
| for define in configuration['defines']: |
| set_define = EscapeXCodeArgument(define) |