Really fix the build, but make bootcd does not work yet.

svn path=/trunk/; revision=21122

diff --git a/reactos/base/base.rbuild b/reactos/base/base.rbuild
index f3a8aef..1ee6609 100644 (file)
--- a/reactos/base/base.rbuild
+++ b/reactos/base/base.rbuild
@@ -4,14 +4,12 @@
   <directory name="applications">\r
   <xi:include href="applications/applications.rbuild" />\r
   </directory>\r
-<!--\r
   <directory name="services">\r
   <xi:include href="services/services.rbuild" />\r
   </directory>\r
   <directory name="setup">\r
   <xi:include href="setup/setup.rbuild" />\r
   </directory>\r
--->\r
   <directory name="shell">\r
   <xi:include href="shell/shell.rbuild" />\r
   </directory>\r

diff --git a/reactos/boot/boot.rbuild b/reactos/boot/boot.rbuild
index 3636ff9..d1bae5b 100644 (file)
--- a/reactos/boot/boot.rbuild
+++ b/reactos/boot/boot.rbuild
@@ -3,3 +3,7 @@
 <directory name="freeldr">
        <xi:include href="freeldr/freeldr.xml" />
 </directory>
+<directory name="bootdata">
+       <xi:include href="bootdata/bootdata.xml" />
+</directory>
+

diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 4a2e24e..3b06d57 100644 (file)
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -229,9 +229,6 @@
 <directory name="version">\r
        <xi:include href="version/version.rbuild" />\r
 </directory>\r
-<directory name="wdmaud">\r
-       <xi:include href="wdmaud/wdmaud.rbuild" />\r
-</directory>\r
 <directory name="wininet">\r
        <xi:include href="wininet/wininet.rbuild" />\r
 </directory>\r

diff --git a/reactos/drivers/base/ramdrv/ramdrv.c b/reactos/drivers/base/ramdrv/ramdrv.c
index 57f1b7a..797924e 100644 (file)
--- a/reactos/drivers/base/ramdrv/ramdrv.c
+++ b/reactos/drivers/base/ramdrv/ramdrv.c
@@ -2,7 +2,7 @@
 #include <ntdddisk.h>
 #include "ramdrv.h"
 #include <debug.h>
-#include "../../lib/bzip2/bzlib.h"
+#include "bzlib.h"
 
 static NTSTATUS STDCALL RamdrvDispatchDeviceControl(PDEVICE_OBJECT DeviceObject,
                                             PIRP Irp)

diff --git a/reactos/drivers/base/ramdrv/ramdrv.xml b/reactos/drivers/base/ramdrv/ramdrv.xml
index 28eb1d9..183d2d6 100644 (file)
--- a/reactos/drivers/base/ramdrv/ramdrv.xml
+++ b/reactos/drivers/base/ramdrv/ramdrv.xml
@@ -1,5 +1,6 @@
 <module name="ramdrv" type="kernelmodedriver">
        <include base="ramdrv">.</include>
+       <include base="bzip2">.</include>
         <define name="__USE_W32API" />
        <library>ntoskrnl</library>
        <library>hal</library>

diff --git a/reactos/drivers/lib/ip/ip.xml b/reactos/drivers/lib/ip/ip.xml
index ea6ea1a..398dbff 100644 (file)
--- a/reactos/drivers/lib/ip/ip.xml
+++ b/reactos/drivers/lib/ip/ip.xml
@@ -2,7 +2,7 @@
        <define name="__NTDRIVER__"/>
        <define name="_SEH_NO_NATIVE_NLG"/>
        <define name="__USE_W32API"/>
-       <include>drivers/net/tcpip/include</include>
+       <include>drivers/network/tcpip/include</include>
        <include>drivers/lib/oskittcp/include</include>
        <directory name="network">
                <if property="ARCH" value="i386">

diff --git a/reactos/drivers/sound/mpu401/mpu401.h b/reactos/drivers/sound/mpu401/mpu401.h
index 1802626..630cd7a 100644 (file)
--- a/reactos/drivers/sound/mpu401/mpu401.h
+++ b/reactos/drivers/sound/mpu401/mpu401.h
@@ -15,7 +15,7 @@
 //#include <mmsystem.h>
 //#include <mmddk.h>
 //#include <winioctl.h>
-#include "../../../lib/mmdrv/mmdef.h"
+#include "../../../dll/win32/mmdrv/mmdef.h"
 
 #define DEFAULT_PORT    0x330
 #define DEFAULT_IRQ     9

diff --git a/reactos/ntoskrnl/inbv/inbv.c b/reactos/ntoskrnl/inbv/inbv.c
index 1b72f30..815b546 100755 (executable)
--- a/reactos/ntoskrnl/inbv/inbv.c
+++ b/reactos/ntoskrnl/inbv/inbv.c
@@ -11,7 +11,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include "../../drivers/dd/bootvid/ntbootvid.h"
+#include "../../drivers/base/bootvid/ntbootvid.h"
 #define NDEBUG
 #include <internal/debug.h>
 

diff --git a/reactos/tools/cabman/cabman.mak b/reactos/tools/cabman/cabman.mak
index 3fb72b9..72643b5 100755 (executable)
--- a/reactos/tools/cabman/cabman.mak
+++ b/reactos/tools/cabman/cabman.mak
@@ -29,7 +29,7 @@ CABMAN_SOURCES = $(addprefix $(CABMAN_BASE_), \
 CABMAN_OBJECTS = \
   $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o))
 
-CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/zlib $(TOOLS_CXXFLAGS)
+CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CXXFLAGS)
 
 CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET)