X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.cpp;h=58f435d51ec10fd8d75cbe777ef0442c8b68c1c4;hb=62853c9bb228cbb541304e866036cd931e3f5500;hp=9ce1acef6c59883f8684eb324f2d594bb17f675f;hpb=d914c5f40ca1194e7fd6a2b30664ac4717e38786;p=builder.git

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 9ce1ace..58f435d 100644
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -1,11 +1,14 @@
 #include <limits>
-#ifndef _WIN32
-#include <sys/utsname.h>
-#endif
 #include <msp/strings/format.h>
 #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;
 using namespace Msp;
@@ -65,6 +68,7 @@ const char *toolchains[] =
 {
 	"gnu",
 	"clang",
+	"msvc",
 	0
 };
 
@@ -72,6 +76,7 @@ const char *aliases[] =
 {
 	"pc",              "x86",
 	"x86_64",          "x86-64",
+	"x64",             "x86-64",
 	"amd64",           "x86-64",
 	"i586",            "pentium",
 	"i686",            "pentiumpro",
@@ -95,18 +100,9 @@ Architecture::Architecture(Builder &b, const string &spec):
 {
 	if(spec.empty())
 	{
-#ifdef _WIN32
-		system = "windows";
-#else
-		utsname un;
-		if(uname(&un)==0)
-		{
-			system = tolower(un.sysname);
-			parse_specification(tolower(un.machine));
-			// We really only want to set type for the default arch
-			cpu.clear();
-		}
-#endif
+		parse_specification(get_system_type());
+		// We really only want to set type for the default arch
+		cpu.clear();
 		bits = sizeof(void *)*numeric_limits<unsigned char>::digits;
 		native = true;
 	}
@@ -136,6 +132,8 @@ Architecture::Architecture(Builder &b, const string &spec):
 	{
 		if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang"))
 			toolchain = "clang";
+		else if(system=="windows" && native)
+			toolchain = "msvc";
 		else
 			toolchain = "gnu";
 	}
@@ -149,23 +147,31 @@ Architecture::Architecture(Builder &b, const string &spec):
 
 	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");
+		if(toolchain=="msvc")
+		{
+			add_pattern<ObjectFile>("%.obj");
+			add_pattern<ImportLibrary>("%.lib");
+			add_pattern<StaticLibrary>("%_static.lib");
+		}
+		else
+		{
+			add_pattern<ObjectFile>("%.o");
+			add_pattern<SharedLibrary>("lib%.dll");
+			add_pattern<ImportLibrary>("lib%.dll.a");
+			add_pattern<StaticLibrary>("lib%.a");
+		}
+		add_pattern<Executable>("%.exe");
 	}
 	else
 	{
+		add_pattern<ObjectFile>("%.o");
 		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>("%");
 	}
 }
 
@@ -184,11 +190,11 @@ bool Architecture::match_name(const string &pattern) const
 	return !negate;
 }
 
-string Architecture::best_match(const list<string> &names) const
+string Architecture::best_match(const vector<string> &names) const
 {
 	string best;
 	unsigned best_size = 0;
-	for(list<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
+	for(vector<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
@@ -208,6 +214,12 @@ string Architecture::best_match(const list<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)