Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-11 08:54:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extract resources to intermediate directory

Browse source 
svn path=/trunk/; revision=28134
This commit is contained in:
Hervé Poussineau 2007-08-03 13:51:19 +00:00
parent 28a8baa325
commit 623ca2cf0a
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -233,12 +233,12 @@ MingwBackend::ProcessNormal ()
GenerateHeader (); GenerateHeader ();
GenerateGlobalVariables (); GenerateGlobalVariables ();
GenerateXmlBuildFilesMacro (); GenerateXmlBuildFilesMacro ();
UnpackWineResources ();
ProcessModules (); ProcessModules ();
GenerateInstallTarget (); GenerateInstallTarget ();
GenerateTestTarget (); GenerateTestTarget ();
GenerateDirectoryTargets (); GenerateDirectoryTargets ();
GenerateDirectories (); GenerateDirectories ();
UnpackWineResources ();
GenerateTestSupportCode (); GenerateTestSupportCode ();
GenerateCompilationUnitSupportCode (); GenerateCompilationUnitSupportCode ();
GenerateSysSetup (); GenerateSysSetup ();

9
reactos/tools/rbuild/wineresource.cpp
View file

@ -103,8 +103,10 @@ WineResource::UnpackResourcesInModule ( Module& module,
module.name.c_str () ); module.name.c_str () );
} }
string outputDirectory = module.GetBasePath (); string relativeDirectory = module.GetBasePath ();
string parameters = ssprintf ( "-b %s -f -x %s", 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 ( outputDirectory ).c_str (),
NormalizeFilename ( resourceFilename ).c_str () ); NormalizeFilename ( resourceFilename ).c_str () );
string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters; string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters;
@ -114,4 +116,7 @@ WineResource::UnpackResourcesInModule ( Module& module,
throw InvocationFailedException ( command, throw InvocationFailedException ( command,
exitcode ); exitcode );
} }
module.non_if_data.includes.push_back( new Include ( module.project,
module.GetBasePath (),
"$(INTERMEDIATE)" ) );
} }