From d18fdef61fd8428458b07d48da52661f5cbb9acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 16 Sep 2007 09:12:15 +0000 Subject: [PATCH] Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se svn path=/trunk/; revision=29064 --- reactos/tools/rbuild/backend/msvc/msvcmaker.cpp | 8 +++++--- reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp index 8581163378a..30163f10a52 100644 --- a/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp +++ b/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp @@ -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 c_srcs, source_files, header_files, resource_files, includes, libraries; StringSet common_defines; vector ifs_list; @@ -102,8 +101,11 @@ MSVCBackend::_generate_dsp ( const Module& module ) const vector& 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" ) ) diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp index c4f91bb7c7f..5bda021cc76 100644 --- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp +++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp @@ -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 source_files, resource_files, header_files, includes, includes_ros, libraries; StringSet common_defines; vector ifs_list; @@ -157,8 +156,11 @@ MSVCBackend::_generate_vcproj ( const Module& module ) const vector& 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 );