Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 04:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add back support for files not in the root of the module directory

Browse source 
Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se

svn path=/trunk/; revision=29064
This commit is contained in:
Hervé Poussineau 2007-09-16 09:12:15 +00:00
parent aa5e4e73cb
commit d18fdef61f
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
View file

@ -82,7 +82,6 @@ MSVCBackend::_generate_dsp ( const Module& module )
//$output->progress("$dsp_file (file $progress_current of $progress_max)");
// TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
string dsp_path = module.output->relative_path;
vector<string> c_srcs, source_files, header_files, resource_files, includes, libraries;
StringSet common_defines;
vector<const IfableData*> ifs_list;
@ -102,8 +101,11 @@ MSVCBackend::_generate_dsp ( const Module& module )
const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ )
{
// TODO FIXME - do we want only the name of the file here?
string file = files[i]->file.name;
// We want the full path here for directory support later on
string path = Path::RelativeFromDirectory (
files[i]->file.relative_path,
module.output->relative_path );
string file = path + std::string("\\") + files[i]->file.name;
source_files.push_back ( file );
if ( !stricmp ( Right(file,2).c_str(), ".c" ) )

8
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -131,7 +131,6 @@ MSVCBackend::_generate_vcproj ( const Module& module )
bool console = exe && (module.type == Win32CUI);
bool include_idl = false;
string vcproj_path = module.output->relative_path;
vector<string> source_files, resource_files, header_files, includes, includes_ros, libraries;
StringSet common_defines;
vector<const IfableData*> ifs_list;
@ -157,8 +156,11 @@ MSVCBackend::_generate_vcproj ( const Module& module )
const vector<File*>& files = data.files;
for ( i = 0; i < files.size(); i++ )
{
// TODO FIXME - do we want only the name of the file here?
string file = files[i]->file.name;
// We want the full path here for directory support later on
string path = Path::RelativeFromDirectory (
files[i]->file.relative_path,
module.output->relative_path );
string file = path + std::string("\\") + files[i]->file.name;
if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
resource_files.push_back ( file );