[hpoussin] 29064: Add back support for files not in the root of the module directory Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se

Author: hpoussin
Date: Sun Sep 16 13:12:15 2007
New Revision: 29064

URL: http://svn.reactos.org/svn/reactos?rev=29064&view=rev
Log:
Add back support for files not in the root of the module directory
Patch by Gregor Brunmar, gregor (dot) brunmar (at) home (dot) se

Modified:
    trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
    trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Sun Sep 16 13:12:15 2007
@@ -82,7 +82,6 @@
 	//$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 @@
 		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" ) )

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Sep 16 13:12:15 2007
@@ -131,7 +131,6 @@
 	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 @@
 		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 );