Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 00:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Generate static libraries in intermediate directory

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

13
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

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

3
reactos/tools/rbuild/backend/mingw/modulehandler.h
View file

@ -28,6 +28,9 @@ public:
const std::string &f, const std::string &f,
Directory* directoryTree ); Directory* directoryTree );
static Directory* GetTargetDirectoryTree (
const Module& module );
static std::string GetTargetFilename ( static std::string GetTargetFilename (
const Module& module, const Module& module,
string_list* pclean_files ); string_list* pclean_files );