[ros-diffs] [fireball] 21901: - Revert dependencies part of r21866 since it breaks compiling on MSVC 2005 (it complains to missing libs which we don't yet compile - like ntdll.lib, gdi32.lib, user32.lib and so on)

Author: fireball
Date: Sun May 14 02:11:25 2006
New Revision: 21901

URL: http://svn.reactos.ru/svn/reactos?rev=21901&view=rev
Log:
- Revert dependencies part of r21866 since it breaks compiling on MSVC 2005 (it complains
to missing libs which we don't yet compile - like ntdll.lib, gdi32.lib, user32.lib and
so on)

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

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun May 14 02:11:25 2006
@@ -646,41 +646,20 @@
 	std::string vcproj_guid,
 	const std::vector<Dependency*>& dependencies )
 {
-	//vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );
-
-	fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\",
\"{%s}\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(),
vcproj_guid.c_str() );
-
-	vector<const IfableData*> ifs_list;
-	ifs_list.push_back ( &module.project.non_if_data );
-	ifs_list.push_back ( &module.non_if_data );
-
+	vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );
+
+	fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\",
\"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(),
vcproj_guid.c_str() );
 
 	//FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies
 	//NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead
-	if (configuration.VSProjectVersion != "7.00") {
-
-		bool has_dependencies = false;
-
-
-
-
-		while ( ifs_list.size() )
-		{
-			const IfableData& data = *ifs_list.back();
-			ifs_list.pop_back();
-			const vector<Library*>& libs = data.libraries;
-			for ( unsigned i = 0; i < libs.size(); i++ )
-			{
-				if ( !has_dependencies ) {
-					fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n"
);
-					has_dependencies = true;
-				}
-
-				fprintf ( OUT, "\t\t{%s} = {%s}\r\n",
libs[i]->importedModule->guid.c_str(),
libs[i]->importedModule->guid.c_str());
-			}
-		}
-		if ( has_dependencies )
-			fprintf ( OUT, "\tEndProjectSection\r\n" );
+	if ((configuration.VSProjectVersion == "7.10") || (dependencies.size() >
0)) {
+		fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );
+		for ( size_t i = 0; i < dependencies.size(); i++ )
+		{
+			Dependency& dependency = *dependencies[i];
+			fprintf ( OUT, "\t\t%s = %s\r\n", dependency.module.guid.c_str(),
dependency.module.guid.c_str() );
+		}
+		fprintf ( OUT, "\tEndProjectSection\r\n" );
 	}
 
 	fprintf ( OUT, "EndProject\r\n" );