From 0eccb4aa9d6f51eb20038bde62cfe5241b66b1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Thu, 6 Sep 2007 07:46:48 +0000
Subject: [PATCH] Add method to get target arch in rbuild

svn path=/trunk/; revision=28894
---
 reactos/tools/rbuild/project.cpp | 13 +++++++++----
 reactos/tools/rbuild/rbuild.h    |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp
index 104f5a74bd0..2d0597bb934 100644
--- a/reactos/tools/rbuild/project.cpp
+++ b/reactos/tools/rbuild/project.cpp
@@ -35,6 +35,12 @@ Environment::GetVariable ( const string& name )
 		return "";
 }
 
+string
+Environment::GetArch ()
+{
+	return GetEnvironmentVariablePathOrDefault ( "ROS_ARCH", "i386" );
+}
+
 /* static */ string
 Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
                                                    const string& defaultValue )
@@ -50,7 +56,7 @@ Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
 Environment::GetIntermediatePath ()
 {
 	string defaultIntermediate =
-		string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" );
+		string( "obj-" ) + GetArch ();
 	return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE",
 	                                             defaultIntermediate );
 }
@@ -59,7 +65,7 @@ Environment::GetIntermediatePath ()
 Environment::GetOutputPath ()
 {
 	string defaultOutput =
-		string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" );
+		string( "output-" ) + GetArch ();
 	return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT",
 	                                             defaultOutput );
 }
@@ -67,8 +73,7 @@ Environment::GetOutputPath ()
 /* static */ string
 Environment::GetInstallPath ()
 {
-	string defaultInstall =
-		string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" );
+	string defaultInstall = GetCdOutputPath ();
 	return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL",
 	                                             defaultInstall );
 }
diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 617d257b6d9..e4753022dd3 100644
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -153,6 +153,7 @@ class Environment
 {
 public:
 	static std::string GetVariable ( const std::string& name );
+	static std::string GetArch ();
 	static std::string GetIntermediatePath ();
 	static std::string GetOutputPath ();
 	static std::string GetCdOutputPath ();