[HAL]

- Fix CMake build

svn path=/trunk/; revision=53427

diff --git a/reactos/hal/halx86/CMakeLists.txt b/reactos/hal/halx86/CMakeLists.txt
index 23f49cf..bdb5ede 100644 (file)
--- a/reactos/hal/halx86/CMakeLists.txt
+++ b/reactos/hal/halx86/CMakeLists.txt
@@ -38,6 +38,7 @@ list(APPEND HAL_GENERIC_PCAT_SOURCE
     generic/legacy/bus/pcidata.c
     generic/legacy/bus/sysbus.c
     generic/legacy/bussupp.c
     generic/legacy/bus/pcidata.c
     generic/legacy/bus/sysbus.c
     generic/legacy/bussupp.c

+    generic/legacy/halpnpdd.c

     generic/legacy/halpcat.c)
 
 list(APPEND HAL_GENERIC_ACPI_SOURCE
     generic/legacy/halpcat.c)
 
 list(APPEND HAL_GENERIC_ACPI_SOURCE

diff --git a/reactos/hal/halx86/hal_generic_acpi.rbuild b/reactos/hal/halx86/hal_generic_acpi.rbuild
index 19e2b80..f2702f4 100644 (file)
--- a/reactos/hal/halx86/hal_generic_acpi.rbuild
+++ b/reactos/hal/halx86/hal_generic_acpi.rbuild
@@ -8,16 +8,16 @@
                <define name="_NTHAL_" />
                <define name="CONFIG_ACPI" />
                <directory name="generic">
                <define name="_NTHAL_" />
                <define name="CONFIG_ACPI" />
                <directory name="generic">

-           <directory name="acpi">
-               <file>halacpi.c</file>
-               <file>halpnpdd.c</file>
-               <file>busemul.c</file>
-           </directory>
-           <directory name="legacy">
-                       <directory name="bus">
-                               <file>pcibus.c</file>
-                       </directory>
-               </directory>
+                       <directory name="acpi">
+                               <file>halacpi.c</file>
+                               <file>halpnpdd.c</file>
+                               <file>busemul.c</file>
+                       </directory>
+                       <directory name="legacy">
+                               <directory name="bus">
+                                       <file>pcibus.c</file>
+                               </directory>
+                       </directory>

                        <if property="ARCH" value="i386">
                                <file>halinit.c</file>
                        </if>
                        <if property="ARCH" value="i386">
                                <file>halinit.c</file>
                        </if>

diff --git a/reactos/hal/halx86/hal_generic_pcat.rbuild b/reactos/hal/halx86/hal_generic_pcat.rbuild
index 85fb646..539b3cf 100644 (file)
--- a/reactos/hal/halx86/hal_generic_pcat.rbuild
+++ b/reactos/hal/halx86/hal_generic_pcat.rbuild
@@ -7,19 +7,19 @@
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
                <directory name="generic">
                <define name="_NTHALDLL_" />
                <define name="_NTHAL_" />
                <directory name="generic">

-               <directory name="legacy">
-                       <directory name="bus">
-                               <file>bushndlr.c</file>
-                               <file>cmosbus.c</file>
-                               <file>isabus.c</file>
-                               <file>pcibus.c</file>
-                               <file>pcidata.c</file>
-                               <file>sysbus.c</file>
-                       </directory>
-                   <file>bussupp.c</file>
-               <file>halpcat.c</file>
+                       <directory name="legacy">
+                               <directory name="bus">
+                                       <file>bushndlr.c</file>
+                                       <file>cmosbus.c</file>
+                                       <file>isabus.c</file>
+                                       <file>pcibus.c</file>
+                                       <file>pcidata.c</file>
+                                       <file>sysbus.c</file>
+                               </directory>
+                               <file>bussupp.c</file>
+                               <file>halpcat.c</file>

                                <file>halpnpdd.c</file>
                                <file>halpnpdd.c</file>

-           </directory>
+                       </directory>

                        <if property="ARCH" value="i386">
                                <file>halinit.c</file>
                        </if>
                        <if property="ARCH" value="i386">
                                <file>halinit.c</file>
                        </if>