From 623ca2cf0aa81ff6783c7463c6950c89bf1b919c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Fri, 3 Aug 2007 13:51:19 +0000
Subject: [PATCH] Extract resources to intermediate directory

svn path=/trunk/; revision=28134
---
 reactos/tools/rbuild/backend/mingw/mingw.cpp | 2 +-
 reactos/tools/rbuild/wineresource.cpp        | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 6ef26d43326..bf6b925acff 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -233,12 +233,12 @@ MingwBackend::ProcessNormal ()
 	GenerateHeader ();
 	GenerateGlobalVariables ();
 	GenerateXmlBuildFilesMacro ();
+	UnpackWineResources ();
 	ProcessModules ();
 	GenerateInstallTarget ();
 	GenerateTestTarget ();
 	GenerateDirectoryTargets ();
 	GenerateDirectories ();
-	UnpackWineResources ();
 	GenerateTestSupportCode ();
 	GenerateCompilationUnitSupportCode ();
 	GenerateSysSetup ();
diff --git a/reactos/tools/rbuild/wineresource.cpp b/reactos/tools/rbuild/wineresource.cpp
index 0fcf8b1af83..a876838c84e 100644
--- a/reactos/tools/rbuild/wineresource.cpp
+++ b/reactos/tools/rbuild/wineresource.cpp
@@ -103,8 +103,10 @@ WineResource::UnpackResourcesInModule ( Module& module,
 		         module.name.c_str () );
 	}
 
-	string outputDirectory = module.GetBasePath ();
-	    string parameters = ssprintf ( "-b %s -f -x %s",
+	string relativeDirectory = module.GetBasePath ();
+	string outputDirectory = Environment::GetIntermediatePath() + sSep + module.GetBasePath ();
+	string parameters = ssprintf ( "-b %s -O %s -f -x %s",
+	                               NormalizeFilename ( relativeDirectory ).c_str (),
 	                               NormalizeFilename ( outputDirectory ).c_str (),
 	                               NormalizeFilename ( resourceFilename ).c_str () );
 	string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters;
@@ -114,4 +116,7 @@ WineResource::UnpackResourcesInModule ( Module& module,
 		throw InvocationFailedException ( command,
 		                                  exitcode );
 	}
+	module.non_if_data.includes.push_back( new Include ( module.project,
+	                                                     module.GetBasePath (),
+	                                                     "$(INTERMEDIATE)" ) );
 }