mirror of
https://github.com/reactos/reactos.git
synced 2025-07-23 18:44:15 +00:00
Generate static libraries in intermediate directory
svn path=/branches/xmlbuildsystem/; revision=15232
This commit is contained in:
parent
be0cf8ed70
commit
d927b8d8fe
2 changed files with 14 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -28,6 +28,9 @@ public:
|
|||
const std::string &f,
|
||||
Directory* directoryTree );
|
||||
|
||||
static Directory* GetTargetDirectoryTree (
|
||||
const Module& module );
|
||||
|
||||
static std::string GetTargetFilename (
|
||||
const Module& module,
|
||||
string_list* pclean_files );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue