Sync to trunk (r46918)

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

diff --git a/hal/halx86/hal_generic.rbuild b/hal/halx86/hal_generic.rbuild
index 166bb93..8dd5f7b 100644 (file)
--- a/hal/halx86/hal_generic.rbuild
+++ b/hal/halx86/hal_generic.rbuild
@@ -16,7 +16,6 @@
                                <file>sysbus.c</file>
                        </directory>
                        <file>beep.c</file>
-                       <file>bios.c</file>
                        <file>cmos.c</file>
                        <file>display.c</file>
                        <file>dma.c</file>
@@ -29,6 +28,7 @@
                        <file>timer.c</file>
                        <file>usage.c</file>
                        <if property="ARCH" value="i386">
+                               <file>bios.c</file>
                                <directory name="i386">
                                        <file>portio.c</file>
                                        <file>systimer.S</file>
@@ -36,9 +36,16 @@
                                </directory>
                        </if>
                        <if property="ARCH" value="amd64">
+                               <define name="_X86BIOS_" />
+                               <include base="x86emu">.</include>
                                <directory name="amd64">
                                        <file>x86bios.c</file>
+                                       <file>halinit.c</file>
+                                       <file>irq.S</file>
+                                       <file>misc.c</file>
+                                       <file>apic.c</file>
                                        <file>systimer.S</file>
+                                       <file>usage.c</file>
                                </directory>
                        </if>
                </directory>
@@ -46,47 +53,4 @@
                        <pch>hal.h</pch>
                </directory>
        </module>
-
-       <module name="mini_hal" type="objectlibrary" crt="static">
-               <include>include</include>
-               <include base="ntoskrnl">include</include>
-               <define name="_NTHALDLL_" />
-               <define name="_NTHAL_" />
-               <define name="_BLDR_" />
-               <define name="_MINIHAL_" />
-               <directory name="generic">
-                       <directory name="bus">
-                               <file>bushndlr.c</file>
-                               <file>isabus.c</file>
-                               <file>halbus.c</file>
-                               <file>pcibus.c</file>
-                               <file>pcidata.c</file>
-                               <file>sysbus.c</file>
-                       </directory>
-                       <file>beep.c</file>
-                       <file>bios.c</file>
-                       <file>cmos.c</file>
-                       <file>dma.c</file>
-                       <file>display.c</file>
-                       <file>drive.c</file>
-                       <file>misc.c</file>
-                       <file>profil.c</file>
-                       <file>reboot.c</file>
-                       <file>spinlock.c</file>
-                       <file>sysinfo.c</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>