[ros-diffs] [hpoussin] 28134: Extract resources to intermediate directory

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Fri Aug  3 17:51:19 2007
New Revision: 28134

URL: http://svn.reactos.org/svn/reactos?rev=28134&view=rev
Log:
Extract resources to intermediate directory

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
    trunk/reactos/tools/rbuild/wineresource.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=28134&r1=28133&r2=28134&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Fri Aug  3 17:51:19 2007
@@ -233,12 +233,12 @@
 	GenerateHeader ();
 	GenerateGlobalVariables ();
 	GenerateXmlBuildFilesMacro ();
+	UnpackWineResources ();
 	ProcessModules ();
 	GenerateInstallTarget ();
 	GenerateTestTarget ();
 	GenerateDirectoryTargets ();
 	GenerateDirectories ();
-	UnpackWineResources ();
 	GenerateTestSupportCode ();
 	GenerateCompilationUnitSupportCode ();
 	GenerateSysSetup ();

Modified: trunk/reactos/tools/rbuild/wineresource.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.cpp?rev=28134&r1=28133&r2=28134&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/wineresource.cpp (original)
+++ trunk/reactos/tools/rbuild/wineresource.cpp Fri Aug  3 17:51:19 2007
@@ -103,8 +103,10 @@
 		         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 @@
 		throw InvocationFailedException ( command,
 		                                  exitcode );
 	}
+	module.non_if_data.includes.push_back( new Include ( module.project,
+	                                                     module.GetBasePath (),
+	                                                     "$(INTERMEDIATE)" ) );
 }