Author: tkreuzer Date: Tue Mar 30 08:10:51 2010 New Revision: 46584
URL: http://svn.reactos.org/svn/reactos?rev=46584&view=rev Log: [HAL] Fix rbuild files a bit.
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -36,6 +36,7 @@ </directory> </if> <if property="ARCH" value="amd64"> + <include base="x86emu">.</include> <directory name="amd64"> <file>x86bios.c</file> <file>halinit.c</file>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> +<if property="ARCH" value="i386"> <module name="hal_generic_up" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> @@ -14,4 +15,5 @@ <file>processor.c</file> </directory> </module> +</if> </group>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -11,15 +11,15 @@ <define name="_NTHAL_" /> <define name="_X86BIOS_" /> <library>hal_generic</library> - <library>hal_generic_up</library> + <library>hal_generic_mp</library> <library>ntoskrnl</library> - <!-- library>x86emu</library --> + <library>x86emu</library>
<directory name="mp"> <file>halinit_mp.c</file> <file>halmp.rc</file> <directory name="amd64"> - <!-- file>mps.S</file --> + <file>mps.S</file> </directory> </directory> </module>
-
tkreuzer＠svn.reactos.org