Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed creation of *.vcproj files for object libraries

Browse source 
started implementing code which adds dependencies to *.sln file
fixed some warnings in cmd when compiling with msvc 2005

svn path=/trunk/; revision=18646
This commit is contained in:
Christoph von Wittich 2005-10-20 21:55:55 +00:00
parent 2a39898c1e
commit d181c34e7a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/system/cmd/precomp.h
View file

@ -1,5 +1,6 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */
#define _CRT_SECURE_NO_DEPRECATE
#endif//_MSC_VER #endif//_MSC_VER
#include <stdlib.h> #include <stdlib.h>

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

@ -53,7 +53,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
} }
string module_type = GetExtension(module.GetTargetName()); string module_type = GetExtension(module.GetTargetName());
bool lib = (module_type == ".lib") || (module_type == ".a"); bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a");
bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool dll = (module_type == ".dll") || (module_type == ".cpl");
bool exe = (module_type == ".exe"); bool exe = (module_type == ".exe");
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'? // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
@ -448,8 +448,13 @@ MSVCBackend::_generate_sln_project (
//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") { if ((configuration.VSProjectVersion == "7.10") || (dependencies.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++ )
{
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, "\tEndProjectSection\r\n" );
} }
@ -477,10 +482,10 @@ MSVCBackend::_generate_sln_footer ( FILE* OUT )
fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" );
fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" ); fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" );
fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" );
if (configuration.VSProjectVersion == "7.00") { if (configuration.VSProjectVersion == "7.00") {
fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" ); fprintf ( OUT, "\tGlobalSection(ProjectDependencies) = postSolution\r\n" );
//FIXME: Add dependencies for VS 2002
fprintf ( OUT, "\tEndGlobalSection\r\n" ); fprintf ( OUT, "\tEndGlobalSection\r\n" );
} }