X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Farchitecture.cpp;h=75a64607a395f7726357d52887fb06e65953277c;hp=3dd76fbf19f86e0e52fca14fee800fee04675dd6;hb=650560b14cac4bb35589b5b8db99197c5e1345cc;hpb=4ee988cdd18d919b11355c21e5234c3f28f5d6a7

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 3dd76fb..75a6460 100644
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -3,6 +3,11 @@
 #include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
+#include "executable.h"
+#include "importlibrary.h"
+#include "objectfile.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
 #include "sysutils.h"
 
 using namespace std;
@@ -70,6 +75,7 @@ const char *aliases[] =
 {
 	"pc",              "x86",
 	"x86_64",          "x86-64",
+	"x64",             "x86-64",
 	"amd64",           "x86-64",
 	"i586",            "pentium",
 	"i686",            "pentiumpro",
@@ -136,26 +142,24 @@ Architecture::Architecture(Builder &b, const string &spec):
 		name += format("-%s", fpu);
 	name += format("-%d-%s-%s", bits, system, toolchain);
 
-	object_patterns.push_back(Pattern("%.o"));
+	add_pattern<ObjectFile>("%.o");
 	if(system=="windows")
 	{
-		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"));
-		executable_patterns.push_back(Pattern("%.exe"));
+		add_pattern<SharedLibrary>("%.dll");
+		add_pattern<SharedLibrary>("lib%.dll");
+		add_pattern<ImportLibrary>("lib%.dll.a");
+		add_pattern<StaticLibrary>("lib%.a");
+		add_pattern<StaticLibrary>("%.lib");
+		add_pattern<Executable>("%.exe");
 	}
 	else
 	{
 		if(system=="darwin")
-			sharedlib_patterns.push_back(Pattern("lib%.dylib"));
+			add_pattern<SharedLibrary>("lib%.dylib");
 		else
-			sharedlib_patterns.push_back(Pattern("lib%.so"));
-		staticlib_patterns.push_back(Pattern("lib%.a"));
-		executable_patterns.push_back(Pattern("%"));
+			add_pattern<SharedLibrary>("lib%.so");
+		add_pattern<StaticLibrary>("lib%.a");
+		add_pattern<Executable>("%");
 	}
 }
 
@@ -198,6 +202,12 @@ string Architecture::best_match(const vector<string> &names) const
 	return best;
 }
 
+template<typename T>
+void Architecture::add_pattern(const string &pat)
+{
+	filename_patterns[typeid(T).name()].push_back(Pattern(pat));
+}
+
 void Architecture::resolve_aliases(vector<string> &parts)
 {
 	for(unsigned i=0; i<parts.size(); ++i)