[freeldr] Move custom.c, drivemap.c/h, miscboot.c/h to i386 directories

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

diff --git a/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild b/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
index 59cfbba..3eaee52 100644 (file)
--- a/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
+++ b/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
@@ -7,13 +7,17 @@
        <include base="ReactOS">include/reactos/libs</include>
        <include base="ReactOS">include/reactos/elf</include>
        <define name="_NTHAL_" />
-       <compilerflag>-fno-inline</compilerflag>
-       <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+       <group compilerset="gcc">
+               <compilerflag>-fno-inline</compilerflag>
+               <compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+       </group>
 
        <if property="ARCH" value="arm">
-               <compilerflag>-ffreestanding</compilerflag>
-               <compilerflag>-fno-builtin</compilerflag>
-               <compilerflag>-Os</compilerflag>
+               <group compilerset="gcc">
+                       <compilerflag>-ffreestanding</compilerflag>
+                       <compilerflag>-fno-builtin</compilerflag>
+                       <compilerflag>-Os</compilerflag>
+               </group>
        </if>
 
        <directory name="arch">
@@ -21,6 +25,8 @@
                        <if property="ARCH" value="i386">
                                <file>_alloca.S</file>
                                <file>archmach.c</file>
+                               <file>custom.c</file>
+                               <file>drivemap.c</file>
                                <file>hardware.c</file>
                                <file>hwacpi.c</file>
                                <file>hwapm.c</file>
@@ -30,6 +36,7 @@
                                <file>i386vid.c</file>
                                <file>loader.c</file>
                                <file>machpc.c</file>
+                               <file>miscboot.c</file>
                                <file>pccons.c</file>
                                <file>pcdisk.c</file>
                                <file>pcmem.c</file>
@@ -65,12 +72,43 @@
                </directory>
                <directory name="arm">
                        <if property="ARCH" value="arm">
-                               <file>boot.s</file>
+                               <file first="true">boot.s</file>
                                <file>ferouart.c</file>
                                <file>loader.c</file>
                                <file>macharm.c</file>
+                               <file>omapuart.c</file>
                                <file>versuart.c</file>
                        </if>
                </directory>
+
+               <if property="ARCH" value="amd64">
+                       <directory name="amd64">
+                               <file>loader.c</file>
+                       </directory>
+                       <directory name="i386">
+                               <file>hardware.c</file>
+                               <file>hwacpi.c</file>
+                               <file>hwapm.c</file>
+                               <file>hwpci.c</file>
+                               <file>i386rtl.c</file>
+                               <file>i386disk.c</file>
+                               <file>i386vid.c</file>
+                               <file>machpc.c</file>
+                               <file>pccons.c</file>
+                               <file>pcdisk.c</file>
+                               <file>pcmem.c</file>
+                               <file>pcrtc.c</file>
+                               <file>pcvideo.c</file>
+                       </directory>
+               </if>
+
+       </directory>
+
+       <directory name="windows">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>ntsetup.c</file>
+                       </directory>
+               </if>
        </directory>
 </module>