Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert 38962 as it breaks bootcd

Browse source 
svn path=/trunk/; revision=38975
This commit is contained in:
Christoph von Wittich 2009-01-20 15:02:04 +00:00
parent 077971b02b
commit 1ff1fb9564
6 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/boot/freeldr/freeldr/bootmgr.c
View file

@ -115,14 +115,6 @@ VOID RunLoader(VOID)
{ {
LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]);
} }
#ifdef FREELDR_ROS_SETUP
else if (_stricmp(SettingValue, "ReactOSSetup") == 0)
{
// Could probably pass the selection across at a later date
// which might be useful for different install methods?
RunReactOSSetup();
}
#endif
#ifdef __i386__ #ifdef __i386__
else if (_stricmp(SettingValue, "WindowsNT40") == 0) else if (_stricmp(SettingValue, "WindowsNT40") == 0)
{ {

6
reactos/boot/freeldr/freeldr/freeldr_base.rbuild
View file

@ -77,12 +77,6 @@
<file>version.c</file> <file>version.c</file>
<file>cmdline.c</file> <file>cmdline.c</file>
<file>machine.c</file> <file>machine.c</file>
<file>drivemap.c</file>
<file>miscboot.c</file>
<file>options.c</file>
<file>linuxboot.c</file>
<file>oslist.c</file>
<file>custom.c</file>
<directory name="include"> <directory name="include">
<pch>freeldr.h</pch> <pch>freeldr.h</pch>
</directory> </directory>

6
reactos/boot/freeldr/freeldr/freeldr_main.rbuild
View file

@ -7,4 +7,10 @@
<compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-inline</compilerflag>
<compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
<file>bootmgr.c</file> <file>bootmgr.c</file>
<file>drivemap.c</file>
<file>miscboot.c</file>
<file>options.c</file>
<file>linuxboot.c</file>
<file>oslist.c</file>
<file>custom.c</file>
</module> </module>

1
reactos/boot/freeldr/freeldr/include/freeldr.h
View file

@ -107,6 +107,5 @@
VOID BootMain(LPSTR CmdLine); VOID BootMain(LPSTR CmdLine);
VOID RunLoader(VOID); VOID RunLoader(VOID);
VOID RunReactOSSetup(VOID);
#endif // defined __FREELDR_H #endif // defined __FREELDR_H

2
reactos/boot/freeldr/freeldr/reactos/setupldr.c
View file

@ -42,7 +42,7 @@ extern BOOLEAN FrLdrLoadNlsFile(PCSTR szFileName, PCSTR szModuleName);
#define USE_UI #define USE_UI
VOID RunReactOSSetup(VOID) VOID RunLoader(VOID)
{ {
ULONG i; ULONG i;
LPCSTR SourcePath; LPCSTR SourcePath;

4
reactos/boot/freeldr/freeldr/setupldr_main.rbuild
View file

@ -4,15 +4,11 @@
<include base="setupldr_main">include</include> <include base="setupldr_main">include</include>
<include base="ntoskrnl">include</include> <include base="ntoskrnl">include</include>
<define name="_NTHAL_" /> <define name="_NTHAL_" />
<define name="FREELDR_ROS_SETUP" />
<compilerflag>-ffreestanding</compilerflag> <compilerflag>-ffreestanding</compilerflag>
<compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-builtin</compilerflag>
<compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-inline</compilerflag>
<compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
<compilerflag>-Os</compilerflag> <compilerflag>-Os</compilerflag>
<file>bootmgr.c</file>
<directory name="inffile"> <directory name="inffile">
<file>inffile.c</file> <file>inffile.c</file>
</directory> </directory>