Author: tkreuzer Date: Tue Apr 13 18:26:48 2010 New Revision: 46860
URL: http://svn.reactos.org/svn/reactos?rev=46860&view=rev Log: [HAL] - Give mini-hal it's own rbuild file - fix amd64 rbuild
Added: trunk/reactos/hal/halx86/hal_mini.rbuild (with props) Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild
Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuild... ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Tue Apr 13 18:26:48 2010 @@ -3,14 +3,15 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="hal_generic.rbuild" /> - <xi:include href="hal_generic_up.rbuild" /> - <xi:include href="hal_generic_mp.rbuild" /> <xi:include href="hal_generic_pcat.rbuild" /> <xi:include href="hal_generic_acpi.rbuild" /> - + <if property="ARCH" value="i386"> + <xi:include href="hal_generic_up.rbuild" /> + <xi:include href="hal_generic_mp.rbuild" /> + <xi:include href="hal_mini.rbuild" /> <xi:include href="hal.rbuild" /> - <xi:include href="halacpi.rbuild" /> + <xi:include href="halacpi.rbuild" /> <xi:include href="halxbox.rbuild" /> <if property="BUILD_MP" value="1"> <xi:include href="halmps.rbuild" />
Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbui... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Apr 13 18:26:48 2010 @@ -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>
Added: trunk/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_mini.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/hal_mini.rbuild (added) +++ trunk/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Tue Apr 13 18:26:48 2010 @@ -1,0 +1,44 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <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> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + </directory> + </directory> + <directory name="up"> + <file>halinit_up.c</file> + <file>pic.c</file> + <file>processor.c</file> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_mini.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Tue Apr 13 18:26:48 2010 @@ -12,17 +12,25 @@ <define name="_X86BIOS_" /> <library>hal_generic</library> <library>hal_generic_acpi</library> - <library>hal_generic_up</library> <library>ntoskrnl</library> - <!-- library>x86emu</library --> + <library>x86emu</library>
- <directory name="mp"> + <directory name="generic"> + <file>spinlock.c</file> + </directory> + + <directory name="up"> + <file>processor.c</file> + </directory> + + <!-- directory name="mp"> <file>halinit_mp.c</file> + <file>processor_mp.c</file> <file>halmp.rc</file> <directory name="amd64"> - <!-- file>mps.S</file --> + <file>mps.S</file> </directory> - </directory> + </directory --> </module> </group>
-
tkreuzer＠svn.reactos.org