mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
Extract resources to intermediate directory
svn path=/trunk/; revision=28134
This commit is contained in:
parent
28a8baa325
commit
623ca2cf0a
|
@ -233,12 +233,12 @@ MingwBackend::ProcessNormal ()
|
|||
GenerateHeader ();
|
||||
GenerateGlobalVariables ();
|
||||
GenerateXmlBuildFilesMacro ();
|
||||
UnpackWineResources ();
|
||||
ProcessModules ();
|
||||
GenerateInstallTarget ();
|
||||
GenerateTestTarget ();
|
||||
GenerateDirectoryTargets ();
|
||||
GenerateDirectories ();
|
||||
UnpackWineResources ();
|
||||
GenerateTestSupportCode ();
|
||||
GenerateCompilationUnitSupportCode ();
|
||||
GenerateSysSetup ();
|
||||
|
|
|
@ -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)" ) );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue