Sync with trunk (48237)

[reactos.git] / boot / freeldr / freeldr / freeldr.rbuild

diff --git a/boot/freeldr/freeldr/freeldr.rbuild b/boot/freeldr/freeldr/freeldr.rbuild
index 9599518..8e70ac9 100644 (file)
--- a/boot/freeldr/freeldr/freeldr.rbuild
+++ b/boot/freeldr/freeldr/freeldr.rbuild
@@ -1,72 +1,36 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-       <if property="ARCH" value="i386">
-               <module name="freeldr" type="bootloader">
-                       <bootstrap installbase="loader" />
-                       <library>freeldr_startup</library>
-                       <library>freeldr_base64k</library>
-                       <library>freeldr_base</library>
-                       <library>freeldr_arch</library>
-                       <library>freeldr_main</library>
-                       <library>rossym</library>
-                       <library>cmlib</library>
-                       <library>rtl</library>
-                       <library>libcntpr</library>
-                       <group linkerset="ld">
-                               <linkerflag>-static</linkerflag>
-                               <linkerflag>-lgcc</linkerflag>
-                       </group>
-               </module>
-       </if>
-       <if property="ARCH" value="arm">
-               <module name="freeldr" type="bootloader" installbase=".." installname="freeldr.sys">
-                       <bootstrap installbase="loader" />
-                       <library>freeldr_arch</library>
-                       <library>freeldr_startup</library>
-                       <library>freeldr_base64k</library>
-                       <library>freeldr_base</library>
-                       <library>freeldr_main</library>
-                       <library>rossym</library>
-                       <library>cmlib</library>
-                       <library>rtl</library>
-                       <library>libcntpr</library>
-                       <group linkerset="ld">
-                               <linkerflag>-lgcc</linkerflag>
-                               <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag>
-                       </group>
-               </module>
-       </if>
-       <if property="ARCH" value="powerpc">
-               <module name="ofwldr" type="elfexecutable" buildtype="OFWLDR">
-                       <library>freeldr_startup</library>
-                       <library>freeldr_base64k</library>
-                       <library>freeldr_base</library>
-                       <library>freeldr_arch</library>
-                       <library>freeldr_main</library>
-                       <library>rossym</library>
-                       <library>cmlib</library>
-                       <library>rtl</library>
-                       <library>libcntpr</library>
-                       <library>ppcmmu</library>
-               </module>
-       </if>
-       <if property="ARCH" value="amd64">
-               <module name="freeldr" type="bootloader">
-                       <bootstrap installbase="loader" />
-                       <library>freeldr_startup</library>
-                       <library>freeldr_base64k</library>
-                       <library>freeldr_base</library>
-                       <library>freeldr_arch</library>
-                       <library>freeldr_main</library>
-                       <library>rossym</library>
-                       <library>cmlib</library>
-                       <library>rtl</library>
-                       <library>libcntpr</library>
-                       <group linkerset="ld">
-                               <linkerflag>-static</linkerflag>
-                               <linkerflag>-lgcc</linkerflag>
-                       </group>
-               </module>
-       </if>
-</group>
+
+<if property="ARCH" value="powerpc">
+       <module name="ofwldr" type="elfexecutable" buildtype="OFWLDR">
+               <library>freeldr_startup</library>
+               <library>freeldr_base64k</library>
+               <library>freeldr_base</library>
+               <library>freeldr_arch</library>
+               <library>freeldr_main</library>
+               <library>rossym</library>
+               <library>cmlib</library>
+               <library>rtl</library>
+               <library>libcntpr</library>
+               <library>ppcmmu</library>
+       </module>
+</if>
+
+<ifnot property="ARCH" value="powerpc">
+       <module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)">
+               <linkerscript>freeldr_$(ARCH).lnk</linkerscript>
+               <bootstrap installbase="loader" />
+               <library>freeldr_startup</library>
+               <library>freeldr_base64k</library>
+               <library>freeldr_base</library>
+               <if property="ARCH" value="i386">
+                       <library>mini_hal</library>
+               </if>
+               <library>freeldr_arch</library>
+               <library>freeldr_main</library>
+               <library>rossym</library>
+               <library>cmlib</library>
+               <library>rtl</library>
+               <library>libcntpr</library>
+       </module>
+</ifnot>