X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=7faefeb456f3953548084782c63079fc466a59fc;hb=a876c04c49ba89497be5d2e80d6e97543dba4f07;hp=5c88354634695e1689b186cb8b65a9648b724da3;hpb=58a28fb253292942e042288f1a621b64e0c2ca90;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 5c88354..7faefeb 100644
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -108,8 +108,10 @@ Architecture::Architecture(Builder &b, const string &spec):
 	{
 		sharedlib_patterns.push_back(Pattern("%.dll"));
 		sharedlib_patterns.push_back(Pattern("lib%.dll"));
+		/* XXX Hack: Consider import libraries (*.dll.a) as dynamic libraries,
+		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%.dll.a"));
 		executable_patterns.push_back(Pattern("%.exe"));
 	}
 	else
@@ -120,23 +122,19 @@ Architecture::Architecture(Builder &b, const string &spec):
 	}
 }
 
-void Architecture::set_cross_prefix(const string &p)
-{
-	cross_prefix = p;
-}
-
 bool Architecture::match_name(const string &pattern) const
 {
-	vector<string> parts = split(pattern, "-");
+	bool negate = (pattern[0]=='!');
+	vector<string> parts = split(pattern.substr(negate), "-");
 	for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
 		string part = resolve_alias(*i);
 		if((part=="32" && bits==32) || (part=="64" && bits==64))
 			;
 		else if(part!=type && part!=cpu && part!=system)
-			return false;
+			return negate;
 	}
-	return true;
+	return !negate;
 }
 
 string Architecture::resolve_alias(const string &part) const
@@ -197,7 +195,7 @@ void Architecture::parse_specification(const string &spec)
 
 
 Architecture::Loader::Loader(Architecture &a):
-	arch(a)
+	DataFile::ObjectLoader<Architecture>(a)
 {
 	add("prefix", &Architecture::cross_prefix);
 }