Add .lib as a static library suffix for Windows

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index a9434986a91170a3de3ef4c7e6462b7b2ee1c911..fe0033891feb903867bc7eb037b8ca9d480c0943 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -126,6 +126,7 @@ Architecture::Architecture(Builder &b, const string &spec):
                even though technically they are linked statically. */
                sharedlib_patterns.push_back(Pattern("lib%.dll.a"));
                staticlib_patterns.push_back(Pattern("lib%.a"));
+               staticlib_patterns.push_back(Pattern("%.lib"));
                executable_patterns.push_back(Pattern("%.exe"));
        }
        else
@@ -154,6 +155,30 @@ bool Architecture::match_name(const string &pattern) const
        return !negate;
 }
 
+string Architecture::best_match(const list<string> &names) const
+{
+       string best;
+       unsigned best_size = 0;
+       for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
+               if(match_name(*i))
+               {
+                       /* TODO Do full parse and alias resolution here?  Otherwise x86 and
+                       x86_64 are treated as equally good, even though the latter is more
+                       specific. */
+                       unsigned size = 1;
+                       for(string::const_iterator j=i->begin(); j!=i->end(); ++j)
+                               size += (*j=='-');
+
+                       if(size>best_size)
+                       {
+                               best = *i;
+                               best_size = size;
+                       }
+               }
+
+       return best;
+}
+
 void Architecture::resolve_aliases(vector<string> &parts)
 {
        for(unsigned i=0; i<parts.size(); ++i)