X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=07f5dbfb0c09159e7fa4fcbb14e7d9e3e6ff03af;hb=217889f81407de43d8de469ad93e05b7d334ae0c;hp=efe9c732dd707696d3d74610e340065c480960f2;hpb=88a344b29ab173cd6ecacd0b038ea96dcb7484fc;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index efe9c73..07f5dbf 100644
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -41,12 +41,15 @@ const char *systems[] =
 {
 	"linux",
 	"freebsd",
+	"darwin",
 	"windows",
+	"android",
 	0
 };
 
 const char *aliases[] =
 {
+	"x86",   "pc",
 	"i586",  "pentium",
 	"i686",  "pentiumpro",
 	"x86_64", "athlon64",
@@ -108,13 +111,18 @@ 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
 	{
-		sharedlib_patterns.push_back(Pattern("lib%.so"));
+		if(system=="darwin")
+			sharedlib_patterns.push_back(Pattern("lib%.dylib"));
+		else
+			sharedlib_patterns.push_back(Pattern("lib%.so"));
 		staticlib_patterns.push_back(Pattern("lib%.a"));
 		executable_patterns.push_back(Pattern("%"));
 	}
@@ -122,16 +130,17 @@ Architecture::Architecture(Builder &b, const string &spec):
 
 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