mirror of
https://github.com/reactos/reactos.git
synced 2024-09-12 05:43:24 +00:00
reduce diff to trunk
svn path=/branches/ros-amd64-bringup/; revision=46456
This commit is contained in:
parent
6965a0af8a
commit
518b7b47b4
|
@ -1423,13 +1423,13 @@ void
|
||||||
MingwModuleHandler::GenerateLinkerCommand () const
|
MingwModuleHandler::GenerateLinkerCommand () const
|
||||||
{
|
{
|
||||||
string definitionFilename;
|
string definitionFilename;
|
||||||
|
|
||||||
const FileLocation *DefinitionFilename = GetDefinitionFilename ();
|
const FileLocation *DefinitionFilename = GetDefinitionFilename ();
|
||||||
|
|
||||||
if ( DefinitionFilename ) {
|
if ( DefinitionFilename ) {
|
||||||
definitionFilename = backend->GetFullName (*DefinitionFilename);
|
definitionFilename = backend->GetFullName (*DefinitionFilename);
|
||||||
delete DefinitionFilename;
|
delete DefinitionFilename;
|
||||||
}
|
}
|
||||||
|
|
||||||
string linkerScriptArgument;
|
string linkerScriptArgument;
|
||||||
if ( module.linkerScript != NULL ) {
|
if ( module.linkerScript != NULL ) {
|
||||||
|
@ -1446,7 +1446,7 @@ MingwModuleHandler::GenerateLinkerCommand () const
|
||||||
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) {
|
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) {
|
||||||
if ( module.cplusplus ) {
|
if ( module.cplusplus ) {
|
||||||
switch ( module.type )
|
switch ( module.type )
|
||||||
{
|
{
|
||||||
case Win32DLL:
|
case Win32DLL:
|
||||||
case Win32OCX:
|
case Win32OCX:
|
||||||
case Win32CUI:
|
case Win32CUI:
|
||||||
|
@ -1458,7 +1458,7 @@ MingwModuleHandler::GenerateLinkerCommand () const
|
||||||
default:
|
default:
|
||||||
extraLibraries = "$$(PROJECT_CCLIBS)";
|
extraLibraries = "$$(PROJECT_CCLIBS)";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
extraLibraries = "$$(PROJECT_CCLIBS)";
|
extraLibraries = "$$(PROJECT_CCLIBS)";
|
||||||
}
|
}
|
||||||
|
@ -1466,7 +1466,7 @@ MingwModuleHandler::GenerateLinkerCommand () const
|
||||||
delete PassThruCacheDirectory ( new FileLocation ( module.output->directory, module.output->relative_path, "" ) );
|
delete PassThruCacheDirectory ( new FileLocation ( module.output->directory, module.output->relative_path, "" ) );
|
||||||
delete PassThruCacheDirectory ( new FileLocation ( IntermediateDirectory, module.output->relative_path, "" ) );
|
delete PassThruCacheDirectory ( new FileLocation ( IntermediateDirectory, module.output->relative_path, "" ) );
|
||||||
|
|
||||||
fprintf ( fMakefile,
|
fprintf ( fMakefile,
|
||||||
"$(eval $(call RBUILD_LINK_RULE,%s,%s,%s,%s,%s,%s,%s))\n",
|
"$(eval $(call RBUILD_LINK_RULE,%s,%s,%s,%s,%s,%s,%s))\n",
|
||||||
module.name.c_str(),
|
module.name.c_str(),
|
||||||
definitionFilename.c_str(),
|
definitionFilename.c_str(),
|
||||||
|
@ -3101,4 +3101,4 @@ MingwElfExecutableModuleHandler::Process ()
|
||||||
|
|
||||||
delete target_file;
|
delete target_file;
|
||||||
fprintf ( fMakefile, "#/ELF EXECUTABLE TARGET\n" );
|
fprintf ( fMakefile, "#/ELF EXECUTABLE TARGET\n" );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue