Adds support for the library_dirs key, which appears in the documentation but was never actually im…

pylib/gyp/generator/ninja.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import gyp
 import gyp.common
 import gyp.msvs_emulation
 import gyp.MSVSVersion
 import gyp.system_test
@@ skipping 720 matching lines @@
                                                   self.GypPathToNinja)])
 
     include_dirs = config.get('include_dirs', [])
     if self.flavor == 'win':
       include_dirs = self.msvs_settings.AdjustIncludeDirs(include_dirs,
                                                           config_name)
     self.WriteVariableList('includes',
         [QuoteShellArgument('-I' + self.GypPathToNinja(i), self.flavor)
          for i in include_dirs])
 
+    library_dirs = config.get('library_dirs', [])
+    if self.flavor == 'win':
+      library_dirs = self.msvs_settings.AdjustLibraryDirs(library_dirs,
+                                                          config_name)
+    self.WriteVariableList('libs',
+        [QuoteShellArgument('-L' + self.GypPathToNinja(l), self.flavor)
+         for l in library_dirs])

[Nico, 2012/07/21 19:14:48]

This will might clash with the variable in line 892. You probably want a new
variable for this.

Also, you need to update the 'cc', 'objcc' etc rules at the end of this file to
actually use this new variable.

[Brian Ellis, 2012/07/23 23:30:26]

I think you mean the 'solink', 'link', etc. rules, but otherwise done.  I have
no real idea what $libs$postbuilds does, so I added my new variable there as
well; please let me know if that's wrong, or if I need to manually use /LIBPATH
on Windows, or anything like that.

+
     pch_commands = precompiled_header.GetPchBuildCommands()
     if self.flavor == 'mac':
       self.WriteVariableList('cflags_pch_c',
                              [precompiled_header.GetInclude('c')])
       self.WriteVariableList('cflags_pch_cc',
                              [precompiled_header.GetInclude('cc')])
       self.WriteVariableList('cflags_pch_objc',
                              [precompiled_header.GetInclude('m')])
       self.WriteVariableList('cflags_pch_objcc',
                              [precompiled_header.GetInclude('mm')])
@@ skipping 877 matching lines @@
 
   user_config = params.get('generator_flags', {}).get('config', None)
   if user_config:
     GenerateOutputForConfig(target_list, target_dicts, data, params,
                             user_config)
   else:
     config_names = target_dicts[target_list[0]]['configurations'].keys()
     for config_name in config_names:
       GenerateOutputForConfig(target_list, target_dicts, data, params,
                               config_name)