Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-13 01:22:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ignore default libraries when msvcrt.lib is used.

Browse source 
Using msvcrt.lib causes duplicate symbols linking errors for projects

svn path=/trunk/; revision=25305
This commit is contained in:
Johannes Anderwald 2007-01-05 08:21:54 +00:00
parent 565b2f4f9e
commit eaaccf0016
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,12 +410,17 @@ MSVCBackend::_generate_vcproj ( const Module& module )
if (module.importLibrary != NULL)
fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str());
fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" );
bool use_msvcrt_lib = false;
for ( i = 0; i < libraries.size(); i++ )
{
if ( i > 0 )
fprintf ( OUT, " " );
string libpath = libraries[i].c_str();
libpath = libpath.erase (0, libpath.find_last_of ("\\") + 1 );
if ( libpath == "msvcrt.lib" )
{
use_msvcrt_lib = true;
}
fprintf ( OUT, "%s", libpath.c_str() );
}
fprintf ( OUT, "\"\r\n" );
@ -474,6 +479,10 @@ MSVCBackend::_generate_vcproj ( const Module& module )
}
else if ( module.type == Win32CUI || module.type == Win32GUI || module.type == Win32SCR)
{
if ( use_msvcrt_lib )
{
fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );
}
fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 );
}
}
@ -491,6 +500,10 @@ MSVCBackend::_generate_vcproj ( const Module& module )
fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false).c_str ());
}
fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ());
if ( use_msvcrt_lib )
{
fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" );
}
}
fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );
}