mirror of
https://github.com/reactos/reactos.git
synced 2024-09-04 17:49:15 +00:00
Few indentation fixes
Generate again boot programs in output directory svn path=/trunk/; revision=28800
This commit is contained in:
parent
4cb8151f10
commit
12b88bedcb
|
@ -267,9 +267,9 @@ MingwModuleHandler::InstanciateHandler (
|
||||||
case EmbeddedTypeLib:
|
case EmbeddedTypeLib:
|
||||||
handler = new MingwEmbeddedTypeLibModuleHandler ( module );
|
handler = new MingwEmbeddedTypeLibModuleHandler ( module );
|
||||||
break;
|
break;
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
handler = new MingwElfExecutableModuleHandler ( module );
|
handler = new MingwElfExecutableModuleHandler ( module );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw UnknownModuleTypeException (
|
throw UnknownModuleTypeException (
|
||||||
module.node.location,
|
module.node.location,
|
||||||
|
@ -2002,6 +2002,8 @@ MingwModuleHandler::GenerateOtherMacros ()
|
||||||
globalCflags += " -pipe";
|
globalCflags += " -pipe";
|
||||||
if ( !module.allowWarnings )
|
if ( !module.allowWarnings )
|
||||||
globalCflags += " -Werror";
|
globalCflags += " -Werror";
|
||||||
|
if ( module.host == HostTrue )
|
||||||
|
globalCflags += " $(HOST_CFLAGS)";
|
||||||
|
|
||||||
// Always force disabling of sibling calls optimisation for GCC
|
// Always force disabling of sibling calls optimisation for GCC
|
||||||
// (TODO: Move to version-specific once this bug is fixed in GCC)
|
// (TODO: Move to version-specific once this bug is fixed in GCC)
|
||||||
|
@ -3149,8 +3151,8 @@ MingwBootProgramModuleHandler::GenerateBootProgramModuleTarget ()
|
||||||
fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
|
fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
|
||||||
|
|
||||||
fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n",
|
fprintf ( fMakefile, "\t$(%s_PREPARE) $(OUTPUT)$(SEP)%s %s\n",
|
||||||
module.buildtype.c_str (),
|
module.buildtype.c_str (),
|
||||||
NormalizeFilename( payload->GetPath() ).c_str (),
|
NormalizeFilename( payload->GetPath() ).c_str (),
|
||||||
junk_cpy.c_str () );
|
junk_cpy.c_str () );
|
||||||
|
|
||||||
fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n",
|
fprintf ( fMakefile, "\t${objcopy} $(%s_FLATFORMAT) %s %s\n",
|
||||||
|
@ -3726,8 +3728,8 @@ MingwElfExecutableModuleHandler::Process ()
|
||||||
fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
|
fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" );
|
||||||
|
|
||||||
fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n",
|
fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n",
|
||||||
module.buildtype.c_str(),
|
module.buildtype.c_str(),
|
||||||
objectsMacro.c_str(),
|
objectsMacro.c_str(),
|
||||||
libsMacro.c_str(),
|
libsMacro.c_str(),
|
||||||
targetMacro.c_str () );
|
targetMacro.c_str () );
|
||||||
}
|
}
|
||||||
|
|
|
@ -518,7 +518,7 @@ public:
|
||||||
class MingwElfExecutableModuleHandler : public MingwModuleHandler
|
class MingwElfExecutableModuleHandler : public MingwModuleHandler
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MingwElfExecutableModuleHandler ( const Module& module );
|
MingwElfExecutableModuleHandler ( const Module& module );
|
||||||
virtual HostType DefaultHost() { return HostFalse; }
|
virtual HostType DefaultHost() { return HostFalse; }
|
||||||
virtual void Process ();
|
virtual void Process ();
|
||||||
};
|
};
|
||||||
|
|
|
@ -892,8 +892,8 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
|
||||||
return IdlHeader;
|
return IdlHeader;
|
||||||
if ( attribute.value == "embeddedtypelib" )
|
if ( attribute.value == "embeddedtypelib" )
|
||||||
return EmbeddedTypeLib;
|
return EmbeddedTypeLib;
|
||||||
if ( attribute.value == "elfexecutable" )
|
if ( attribute.value == "elfexecutable" )
|
||||||
return ElfExecutable;
|
return ElfExecutable;
|
||||||
throw InvalidAttributeValueException ( location,
|
throw InvalidAttributeValueException ( location,
|
||||||
attribute.name,
|
attribute.name,
|
||||||
attribute.value );
|
attribute.value );
|
||||||
|
@ -942,7 +942,7 @@ Module::GetDefaultModuleExtension () const
|
||||||
case RpcClient:
|
case RpcClient:
|
||||||
return ".o";
|
return ".o";
|
||||||
case Alias:
|
case Alias:
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
return "";
|
return "";
|
||||||
case EmbeddedTypeLib:
|
case EmbeddedTypeLib:
|
||||||
|
@ -995,7 +995,7 @@ Module::GetDefaultModuleEntrypoint () const
|
||||||
case Alias:
|
case Alias:
|
||||||
case BootProgram:
|
case BootProgram:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
case EmbeddedTypeLib:
|
case EmbeddedTypeLib:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
@ -1024,8 +1024,8 @@ Module::GetDefaultModuleBaseaddress () const
|
||||||
case KernelModeDLL:
|
case KernelModeDLL:
|
||||||
case KernelModeDriver:
|
case KernelModeDriver:
|
||||||
return "0x00010000";
|
return "0x00010000";
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
return "0xe00000";
|
return "0xe00000";
|
||||||
case BuildTool:
|
case BuildTool:
|
||||||
case StaticLibrary:
|
case StaticLibrary:
|
||||||
case ObjectLibrary:
|
case ObjectLibrary:
|
||||||
|
@ -1085,7 +1085,7 @@ Module::IsDLL () const
|
||||||
case Alias:
|
case Alias:
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
case EmbeddedTypeLib:
|
case EmbeddedTypeLib:
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
throw InvalidOperationException ( __FILE__,
|
throw InvalidOperationException ( __FILE__,
|
||||||
|
@ -1111,19 +1111,19 @@ Module::GenerateInOutputTree () const
|
||||||
case BuildTool:
|
case BuildTool:
|
||||||
case BootLoader:
|
case BootLoader:
|
||||||
case BootSector:
|
case BootSector:
|
||||||
|
case BootProgram:
|
||||||
case Iso:
|
case Iso:
|
||||||
case LiveIso:
|
case LiveIso:
|
||||||
case IsoRegTest:
|
case IsoRegTest:
|
||||||
case LiveIsoRegTest:
|
case LiveIsoRegTest:
|
||||||
case EmbeddedTypeLib:
|
case EmbeddedTypeLib:
|
||||||
case ElfExecutable:
|
case ElfExecutable:
|
||||||
return true;
|
return true;
|
||||||
case StaticLibrary:
|
case StaticLibrary:
|
||||||
case ObjectLibrary:
|
case ObjectLibrary:
|
||||||
case RpcServer:
|
case RpcServer:
|
||||||
case RpcClient:
|
case RpcClient:
|
||||||
case Alias:
|
case Alias:
|
||||||
case BootProgram:
|
|
||||||
case IdlHeader:
|
case IdlHeader:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -275,7 +275,7 @@ enum ModuleType
|
||||||
IsoRegTest = 24,
|
IsoRegTest = 24,
|
||||||
LiveIsoRegTest = 25,
|
LiveIsoRegTest = 25,
|
||||||
EmbeddedTypeLib = 26,
|
EmbeddedTypeLib = 26,
|
||||||
ElfExecutable = 27
|
ElfExecutable = 27
|
||||||
};
|
};
|
||||||
|
|
||||||
enum HostType
|
enum HostType
|
||||||
|
|
Loading…
Reference in a new issue