Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904,

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

diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index 568dcbd..98d50f0 100644 (file)
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -10,7 +10,9 @@
                        <xi:include href="halx86/hal_generic_up.rbuild" />
                        <xi:include href="halx86/hal_generic_pc.rbuild" />
                        <xi:include href="halx86/halup.rbuild" />
-                       <xi:include href="halx86/halmp.rbuild" />
+                       <if property="BUILD_MP" value="1">
+                               <xi:include href="halx86/halmp.rbuild" />
+                       </if>
                        <xi:include href="halx86/halxbox.rbuild" />
                </directory>
        </if>
@@ -25,6 +27,9 @@
                </directory>
        </if>
        <if property="ARCH" value="amd64">
+               <directory name="halx86">
+                       <xi:include href="halx86/hal_generic_amd64.rbuild" />
+               </directory>
                <directory name="halamd64">
                        <xi:include href="halamd64/directory.rbuild" />
                </directory>