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

Set libraries as project dependencies

Browse source 
svn path=/trunk/; revision=22242
This commit is contained in:
Hervé Poussineau 2006-06-05 21:46:14 +00:00
parent 485867fdaf
commit b3f2b879b0
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/tools/rbuild/backend/msvc/msvc.h
View file

@ -108,7 +108,7 @@ class MSVCBackend : public Backend
std::string vcproj_file, std::string vcproj_file,
std::string sln_guid, std::string sln_guid,
std::string vcproj_guid, std::string vcproj_guid,
const std::vector<Dependency*>& dependencies ); const std::vector<Library*>& libraries );
void _generate_sln_configurations ( void _generate_sln_configurations (
FILE* OUT, FILE* OUT,
std::string vcproj_guid ); std::string vcproj_guid );

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

@ -644,20 +644,20 @@ MSVCBackend::_generate_sln_project (
std::string vcproj_file, std::string vcproj_file,
std::string sln_guid, std::string sln_guid,
std::string vcproj_guid, std::string vcproj_guid,
const std::vector<Dependency*>& dependencies ) const std::vector<Library*>& libraries )
{ {
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() ); 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.10") || (dependencies.size() > 0)) { if ((configuration.VSProjectVersion == "7.10") || (libraries.size() > 0)) {
fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );
for ( size_t i = 0; i < dependencies.size(); i++ ) for ( size_t i = 0; i < libraries.size(); i++ )
{ {
Dependency& dependency = *dependencies[i]; const Module& module = *libraries[i]->importedModule;
fprintf ( OUT, "\t\t%s = %s\r\n", dependency.module.guid.c_str(), dependency.module.guid.c_str() ); fprintf ( OUT, "\t\t{%s} = {%s}\r\n", module.guid.c_str(), module.guid.c_str() );
} }
fprintf ( OUT, "\tEndProjectSection\r\n" ); fprintf ( OUT, "\tEndProjectSection\r\n" );
} }
@ -726,7 +726,7 @@ MSVCBackend::_generate_sln ( FILE* OUT )
Module& module = *ProjectNode.modules[i]; Module& module = *ProjectNode.modules[i];
std::string vcproj_file = VcprojFileName ( module ); std::string vcproj_file = VcprojFileName ( module );
_generate_sln_project ( OUT, module, vcproj_file, sln_guid, module.guid, module.dependencies ); _generate_sln_project ( OUT, module, vcproj_file, sln_guid, module.guid, module.non_if_data.libraries );
} }
_generate_sln_footer ( OUT ); _generate_sln_footer ( OUT );
} }