X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=1f643dc325b4a1512170d95b50b22871b84de5bd;hb=51d5a0f618faabfce9a0a5d5dd64b0b0d52b97cb;hp=af586192f9ef44b4dafa9103c68ca2b797000e43;hpb=3585dea6eabf5f1565886bf09c2bdb2eee978912;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index af58619..1f643dc 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef ARCHITECTURE_H_
 #define ARCHITECTURE_H_
 
 #include <msp/datafile/loader.h>
+#include "buildinfo.h"
 #include "misc.h"
 
 class Builder;
@@ -19,27 +13,45 @@ class Architecture
 public:
 	class Loader: public Msp::DataFile::Loader
 	{
+	private:
+		Architecture &arch;
+
 	public:
 		Loader(Architecture &);
 		Architecture &get_object() { return arch; }
 	private:
-		Architecture &arch;
-
 		void tool(const std::string &t, const std::string &p);
 	};
 
-	Architecture(Builder &b, const std::string &n, bool a=false);
-	void set_tool(const std::string &t, const std::string &p);
-	std::string get_tool(const std::string &t) const;
+private:
+	Builder &builder;
+	std::string type;
+	std::string cpu;
+	std::string system;
+	unsigned bits;
+	std::string name;
+	bool native;
+	std::string cross_prefix;
+	StringMap tools;
+
+public:
+	Architecture(Builder &b, const std::string &spec);
+
 	const std::string &get_name() const { return name; }
+	const std::string &get_system() const { return system; }
+	unsigned get_bits() const { return bits; }
+	const std::string &get_cpu() const { return cpu; }
+	bool match_name(const std::string &) const;
 	bool is_native() const { return native; }
-	const std::string &get_prefix() const { return prefix; }
+
+	void set_tool(const std::string &t, const std::string &p);
+	void set_cross_prefix(const std::string &);
+	std::string get_tool(const std::string &t) const;
+	const std::string &get_cross_prefix() const { return cross_prefix; }
+
 private:
-	Builder     &builder;
-	std::string name;
-	bool        native;
-	std::string prefix;
-	StringMap   tools;
+	std::string resolve_alias(const std::string &) const;
+	void parse_specification(const std::string &);
 };
 
 typedef std::map<std::string, Architecture> ArchMap;