--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-02-26 16:40:44 UTC (rev 13754)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-02-26 17:11:06 UTC (rev 13755)
@@ -1340,9 +1340,10 @@
string base_tmp = ros_junk + module.name + ".base.tmp";
string junk_tmp = ros_junk + module.name + ".junk.tmp";
string temp_exp = ros_junk + module.name + ".temp.exp";
- string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+ string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
module.GetBasePath ().c_str (),
- module.entrypoint.c_str () );
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateMacrosAndTargetsTarget ( module );
@@ -1466,8 +1467,9 @@
archiveFilename.c_str (),
importLibraryDependencies.c_str () );
- string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
"${gcc}",
linkerParameters,
@@ -1523,8 +1525,9 @@
archiveFilename.c_str (),
importLibraryDependencies.c_str () );
- string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
"${gcc}",
linkerParameters,
@@ -1576,8 +1579,9 @@
archiveFilename.c_str (),
importLibraryDependencies.c_str () );
- string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
"${gcc}",
linkerParameters,
@@ -1633,8 +1637,9 @@
archiveFilename.c_str (),
importLibraryDependencies.c_str () );
- string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
"${gcc}",
linkerParameters,
@@ -1712,8 +1717,9 @@
else
linker = "${gcc}";
- string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
linker,
linkerParameters,
@@ -1770,8 +1776,9 @@
else
linker = "${gcc}";
- string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
linker,
linkerParameters,
@@ -1828,8 +1835,9 @@
else
linker = "${gcc}";
- string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
- module.entrypoint.c_str () );
+ string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
+ module.entrypoint.c_str (),
+ module.baseaddress.c_str () );
GenerateLinkerCommand ( module,
linker,
linkerParameters,
--- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-02-26 16:40:44 UTC (rev 13754)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-02-26 17:11:06 UTC (rev 13755)
@@ -3,21 +3,16 @@
Building ReactOS
----------------
-To generate GNU make makefiles for building ReactOS do the following:
+To generate GNU make makefiles and building ReactOS do the following:
1) Go to the top-level reactos directory
- 2) Run the command: mingw32-make -C tools\reactos
- 3) Run the command: tools\rbuild\rbuild mingw
+ 2) Run the command: mingw32-make
-This will generate Makefile.auto in the current directory. Now run the following command:
-
- mingw32-make -f Makefile.auto
-
This will start building ReactOS.
To build a bootable CD run the following command:
- mingw32-make -f Makefile.auto bootcd
+ mingw32-make bootcd
This will create ReactOS.iso in the top-level reactos directory.
@@ -112,7 +107,7 @@
There can be zero or more modules per xml build file.
Syntax:
- <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" mangledsymbols="true">
+ <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true">
...
</module>
@@ -120,7 +115,8 @@
name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type.
type - Type of module. See below for an explanation of module types.
extension - Extension of the generated file if such file is generated for the particular module type.
- entrypoint - Entrypoint for the generated file if such file is generated for the particular module type.
+ entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type.
+ baseaddress - Base address of the generated file if such file is generated for the particular module type.
mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true.
Value:
@@ -133,18 +129,18 @@
Module types
------------
The module type determines the actions that is to be carried out to process the module. The defined module types are seen below:
- buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint module attribute is not applicable for this module type.
- staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint module attribute is not applicable for this module type.
- objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint module attribute is not applicable for this module type.
+ buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+ staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+ objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
kernel - Builds ntoskrnl.exe. Default extension is .exe. Default entrypoint is _NtProcessStartup.
kernelmodedll - Builds a kernel-mode DLL. Default extension is .dll. Default entrypoint is _DriverEntry@8.
kernelmodedriver - Builds a kernel-mode driver. Default extension is .sys. Default entrypoint is _DriverEntry@8.
nativedll - Builds a native DLL. Default extension is .dll. Default entrypoint is _DllMainCRTStartup@12.
win32dll - Builds a Win32 DLL. Default extension is .dll. Default entrypoint is _DllMain@12.
- win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup.
- bootloader - Builds a bootloader. The extension and entrypoint module attributes are not applicable for this module type.
- bootsector - Builds one or more bootsector binaries. The extension and entrypoint module attributes are not applicable for this module type.
- iso - Builds a bootable CD. The extension and entrypoint module attributes are not applicable for this module type
+ win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. The baseaddress module attribute is not applicable for this module type.
+ bootloader - Builds a bootloader. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+ bootsector - Builds one or more bootsector binaries. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+ iso - Builds a bootable CD. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
Define element