sync with trunk r46493

[reactos.git] / hal / halx86 / hal_generic.rbuild

diff --git a/hal/halx86/hal_generic.rbuild b/hal/halx86/hal_generic.rbuild
index 99528c9..154379f 100644 (file)
--- a/hal/halx86/hal_generic.rbuild
+++ b/hal/halx86/hal_generic.rbuild
@@ -18,24 +18,35 @@
                        <file>beep.c</file>
                        <file>bios.c</file>
                        <file>cmos.c</file>
+                       <file>display.c</file>
                        <file>dma.c</file>
                        <file>drive.c</file>
-                       <file>display.c</file>
                        <file>halinit.c</file>
                        <file>misc.c</file>
-                       <file>portio.c</file>
                        <file>profil.c</file>
                        <file>reboot.c</file>
                        <file>sysinfo.c</file>
-                       <file>systimer.S</file>
                        <file>timer.c</file>
-                       <file>trap.S</file>
                        <file>usage.c</file>
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>portio.c</file>
+                                       <file>systimer.S</file>
+                                       <file>trap.S</file>
+                               </directory>
+                       </if>
+                       <if property="ARCH" value="amd64">
+                               <directory name="amd64">
+                                       <file>x86bios.c</file>
+                                       <file>systimer.S</file>
+                               </directory>
+                       </if>
                </directory>
                <directory name="include">
                        <pch>hal.h</pch>
                </directory>
        </module>
+
        <module name="mini_hal" type="objectlibrary">
                <include>include</include>
                <include base="ntoskrnl">include</include>
@@ -59,19 +70,23 @@
                        <file>display.c</file>
                        <file>drive.c</file>
                        <file>misc.c</file>
-                       <file>pic.c</file>
-                       <file>portio.c</file>
-                       <file>processor.c</file>
                        <file>profil.c</file>
                        <file>reboot.c</file>
                        <file>spinlock.c</file>
                        <file>sysinfo.c</file>
-                       <file>systimer.S</file>
                        <file>timer.c</file>
                        <file>usage.c</file>
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>portio.c</file>
+                                       <file>systimer.S</file>
+                               </directory>
+                       </if>
                </directory>
                <directory name="up">
                        <file>halinit_up.c</file>
+                       <file>pic.c</file>
+                       <file>processor.c</file>
                </directory>
        </module>
 </group>