X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=653a81ad22cf51ca83bbced40c0183c991b89947;hb=433f9ef196b6f5af6bb38447b650f5afaa5a783a;hp=81f5f13678be09d432d46ae53d2bb785357285ac;hpb=5622fc20f0be8bff0938d24f6f45d3ab384288ca;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 81f5f13..653a81a 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -40,8 +40,8 @@ private:
 	public:
 		Loader(Builder &, const Msp::FS::Path &);
 	private:
-		void architecture(const std::string &);
 		void binpkg(const std::string &);
+		void cross_prefix(const std::string &, const std::string &);
 		void profile(const std::string &);
 		void package(const std::string &);
 	};
@@ -75,9 +75,9 @@ private:
 	TargetMap includes;
 	TargetMap libraries;
 
-	ArchMap archs;
-	Architecture *native_arch;
-	const Architecture *current_arch;
+	Architecture native_arch;
+	Architecture *current_arch;
+	StringMap cross_prefixes;
 	ProfileTemplateMap profile_tmpl;
 
 	ProblemList problems;
@@ -117,6 +117,8 @@ public:
 
 	SourcePackage *get_main_package() const { return main_pkg; }
 
+	std::string run_pkgconfig(const std::string &, const std::string &);
+
 	/** Looks up a target by name.  Returns 0 if no such target exists. */
 	Target *get_target(const std::string &) const;
 
@@ -136,9 +138,8 @@ public:
 	Target *get_library(const std::string &, const StringList &, LibMode);
 
 	const Msp::FS::Path &get_cwd() const { return cwd; }
-	const Architecture &get_architecture(const std::string &) const;
 	const Architecture &get_current_arch() const { return *current_arch; }
-	const Architecture &get_native_arch() const { return *native_arch; }
+	const Architecture &get_native_arch() const { return native_arch; }
 	const Msp::FS::Path &get_prefix() const { return prefix; }
 	const StringList &get_warnings() const { return warnings; }
 	void apply_profile_template(Config &, const std::string &) const;