Generate static libraries in intermediate directory

svn path=/branches/xmlbuildsystem/; revision=15232
This commit is contained in:
Casper Hornstrup 2005-05-11 20:58:40 +00:00
parent be0cf8ed70
commit d927b8d8fe
2 changed files with 14 additions and 2 deletions

View file

@ -113,6 +113,15 @@ MingwModuleHandler::PassThruCacheDirectory (
return generatedFilesDirectory + SSEP + file;
}
/*static*/ Directory*
MingwModuleHandler::GetTargetDirectoryTree (
const Module& module )
{
if ( module.type == StaticLibrary )
return backend->intermediateDirectory;
return backend->outputDirectory;
}
/*static*/ string
MingwModuleHandler::GetTargetFilename (
const Module& module,
@ -120,7 +129,7 @@ MingwModuleHandler::GetTargetFilename (
{
string target = PassThruCacheDirectory (
NormalizeFilename ( module.GetPath () ),
backend->outputDirectory );
backend->intermediateDirectory );
if ( pclean_files )
{
string_list& clean_files = *pclean_files;
@ -136,7 +145,7 @@ MingwModuleHandler::GetImportLibraryFilename (
{
string target = PassThruCacheDirectory (
NormalizeFilename ( module.GetDependencyPath () ),
backend->outputDirectory );
backend->intermediateDirectory );
if ( pclean_files )
{
string_list& clean_files = *pclean_files;