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

- 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)

Browse source 
svn path=/trunk/; revision=21901
This commit is contained in:
Aleksey Bragin 2006-05-13 22:11:25 +00:00
parent c37d7e43f9
commit ae9f01ed84
1 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -646,41 +646,20 @@ MSVCBackend::_generate_sln_project (
std::string vcproj_guid, std::string vcproj_guid,
const std::vector<Dependency*>& dependencies ) const std::vector<Dependency*>& dependencies )
{ {
//vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); 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 );
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 //FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies
//NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead //NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead
if (configuration.VSProjectVersion != "7.00") { if ((configuration.VSProjectVersion == "7.10") || (dependencies.size() > 0)) {
fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );
bool has_dependencies = false; for ( size_t i = 0; i < dependencies.size(); i++ )
while ( ifs_list.size() )
{ {
const IfableData& data = *ifs_list.back(); Dependency& dependency = *dependencies[i];
ifs_list.pop_back(); fprintf ( OUT, "\t\t%s = %s\r\n", dependency.module.guid.c_str(), dependency.module.guid.c_str() );
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" );
fprintf ( OUT, "\tEndProjectSection\r\n" );
} }
fprintf ( OUT, "EndProject\r\n" ); fprintf ( OUT, "EndProject\r\n" );