Author: sserapion Date: Sat Apr 3 23:37:46 2010 New Revision: 46704
URL: http://svn.reactos.org/svn/reactos?rev=46704&view=rev Log: Fix x86 build. Forever.
Removed: branches/ros-amd64-bringup/reactos/drivers/battery/cmbatt/ Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff branches/ros-amd64-bringup/reactos/dll/3rdparty/3rdparty.rbuild branches/ros-amd64-bringup/reactos/drivers/battery/directory.rbuild branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild
Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/b... ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Apr 3 23:37:46 2010 @@ -487,10 +487,12 @@ drivers\base\null\null.sys 2 drivers\base\nmidebug\nmidebug.sys 2
-drivers\battery\cmbatt\cmbatt.sys 2 drivers\battery\battc\battc.sys 2
drivers\bus\isapnp\isapnp.sys 2 + +drivers\bus\acpi\cmbatt\cmbatt.sys 2 +drivers\bus\acpi\compbatt\compbatt.sys 2
drivers\directx\dxapi\dxapi.sys 2 drivers\directx\dxg\dxg.sys 2 @@ -505,6 +507,7 @@ drivers\input\sermouse\sermouse.sys 2
drivers\ksfilter\ks\ks.sys 2 +drivers\multimedia\bdasup\bdasup.sys 2
drivers\network\afd\afd.sys 2 drivers\network\ndis\ndis.sys 2 @@ -523,7 +526,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2
drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1
Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Sat Apr 3 23:37:46 2010 @@ -4,9 +4,9 @@ <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> </directory> - <!-- directory name="libjpeg"> + <directory name="libjpeg"> <xi:include href="libjpeg/libjpeg.rbuild" /> - </directory --> + </directory> <directory name="libxslt"> <xi:include href="libxslt/libxslt.rbuild" /> </directory>
Modified: branches/ros-amd64-bringup/reactos/drivers/battery/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/battery/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/battery/directory.rbuild [iso-8859-1] Sat Apr 3 23:37:46 2010 @@ -4,7 +4,4 @@ <directory name="battc"> <xi:include href="battc/battc.rbuild" /> </directory> -<directory name="cmbatt"> - <xi:include href="cmbatt/cmbatt.rbuild" /> -</directory> </group>
Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbatt.rbuild [iso-8859-1] Sat Apr 3 23:37:46 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="cmbattx" type="kernelmodedriver" installbase="system32/drivers" installname="cmbattx.sys"> +<module name="cmbatt" type="kernelmodedriver" installbase="system32/drivers" installname="cmbatt.sys"> <library>ntoskrnl</library> <library>hal</library> <library>battc</library>