From 83d81567a24dd0dd86df447324152eeb1f34de56 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Fri, 12 Mar 2010 21:28:06 +0000
Subject: [PATCH 1/1] Revert 45697: "* Disable compiling usermode components
 for now."

svn path=/branches/header-work/; revision=46151
---
 ReactOS-i386.rbuild                        | 15 ++++++---------
 config.template.rbuild                     |  6 ------
 drivers/wdm/audio/backpln/directory.rbuild |  9 +++------
 lib/3rdparty/3rdparty.rbuild               | 10 +++-------
 lib/3rdparty/mingw/mingw.rbuild            |  4 +---
 lib/tdilib/tdilib.rbuild                   | 16 +++++++---------
 subsystems/subsystems.rbuild               |  8 +++-----
 subsystems/win32/win32.rbuild              |  8 +++-----
 8 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/ReactOS-i386.rbuild b/ReactOS-i386.rbuild
index c2a720a640e..44e3511c28a 100644
--- a/ReactOS-i386.rbuild
+++ b/ReactOS-i386.rbuild
@@ -37,18 +37,15 @@
 		<linkerflag>-section-alignment=0x1000</linkerflag>
 	</group>
 
-	<if property="USERMODE" value="1">
-		<directory name="base">
-			<xi:include href="base/base.rbuild" />
-		</directory>
-		<directory name="dll">
-			<xi:include href="dll/dll.rbuild" />
-		</directory>
-	</if>
-
+	<directory name="base">
+		<xi:include href="base/base.rbuild" />
+	</directory>
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
 	</directory>
+	<directory name="dll">
+		<xi:include href="dll/dll.rbuild" />
+	</directory>
 	<directory name="drivers">
 		<xi:include href="drivers/drivers.rbuild" />
 	</directory>
diff --git a/config.template.rbuild b/config.template.rbuild
index c0d17e36f70..d8a130414d9 100644
--- a/config.template.rbuild
+++ b/config.template.rbuild
@@ -99,10 +99,4 @@
 -->
 <property name="BUILD_MP" value="1" />
 
-<!--
-	Whether to compile any usermode parts. This is while kernel mode is under
-	heavy development and usermode part not relevant for bootcd.
--->
-<property name="USERMODE" value="0" />
-
 </group>
diff --git a/drivers/wdm/audio/backpln/directory.rbuild b/drivers/wdm/audio/backpln/directory.rbuild
index 2db6e3529bc..e65bc580a61 100644
--- a/drivers/wdm/audio/backpln/directory.rbuild
+++ b/drivers/wdm/audio/backpln/directory.rbuild
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-
-	<if property="USERMODE" value="1">
-		<directory name="audio_test">
-			<xi:include href="audio_test/audio_test.rbuild" />
-		</directory>
-	</if>
+	<directory name="audio_test">
+		<xi:include href="audio_test/audio_test.rbuild" />
+	</directory>
 	<directory name="portcls">
 		<xi:include href="portcls/portcls.rbuild" />
 	</directory>
diff --git a/lib/3rdparty/3rdparty.rbuild b/lib/3rdparty/3rdparty.rbuild
index 28bbf8dafa5..7f0c2006e45 100644
--- a/lib/3rdparty/3rdparty.rbuild
+++ b/lib/3rdparty/3rdparty.rbuild
@@ -7,13 +7,9 @@
 	<directory name="bzip2">
 		<xi:include href="bzip2/bzip2.rbuild" />
 	</directory>
-
-	<if property="USERMODE" value="1">
-		<directory name="cardlib">
-			<xi:include href="cardlib/cardlib.rbuild" />
-		</directory>
-	</if>
-
+	<directory name="cardlib">
+		<xi:include href="cardlib/cardlib.rbuild" />
+	</directory>
 	<directory name="expat">
 		<xi:include href="expat/expat.rbuild" />
 	</directory>
diff --git a/lib/3rdparty/mingw/mingw.rbuild b/lib/3rdparty/mingw/mingw.rbuild
index 18072088853..0e87ee7971b 100644
--- a/lib/3rdparty/mingw/mingw.rbuild
+++ b/lib/3rdparty/mingw/mingw.rbuild
@@ -4,9 +4,7 @@
 <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
 	<define name="_CRTBLD" />
 	<include base="ReactOS">include/reactos/mingw-w64</include>
-	<if property="USERMODE" value="1">
-		<library>kernel32</library>
-	</if>
+	<library>kernel32</library>
 	<file>_newmode.c</file>
 	<file>atonexit.c</file>
 	<file>charmax.c</file>
diff --git a/lib/tdilib/tdilib.rbuild b/lib/tdilib/tdilib.rbuild
index 355073bcf53..ec06f02285e 100644
--- a/lib/tdilib/tdilib.rbuild
+++ b/lib/tdilib/tdilib.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
-<if property="USERMODE" value="1">
-	<module name="tdilib" type="staticlibrary">
-		<include base="iphlpapi">.</include>
-		<include base="tdilib">.</include>
-		<library>ntdll</library>
-		<file>enum.c</file>
-		<file>handle.c</file>
-	</module>
-</if>
\ No newline at end of file
+<module name="tdilib" type="staticlibrary">
+	<include base="iphlpapi">.</include>
+	<include base="tdilib">.</include>
+	<library>ntdll</library>
+	<file>enum.c</file>
+	<file>handle.c</file>
+</module>
diff --git a/subsystems/subsystems.rbuild b/subsystems/subsystems.rbuild
index 87042d7db01..49a9029d4da 100644
--- a/subsystems/subsystems.rbuild
+++ b/subsystems/subsystems.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="USERMODE" value="1">
-	<directory name="ntvdm">
-		<xi:include href="ntvdm/ntvdm.rbuild" />
-	</directory>
-</if>
+<directory name="ntvdm">
+	<xi:include href="ntvdm/ntvdm.rbuild" />
+</directory>
 <directory name="win32">
 	<xi:include href="win32/win32.rbuild" />
 </directory>
diff --git a/subsystems/win32/win32.rbuild b/subsystems/win32/win32.rbuild
index 50546eb032c..7dc498f28dd 100644
--- a/subsystems/win32/win32.rbuild
+++ b/subsystems/win32/win32.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="USERMODE" value="1">
-	<directory name="csrss">
-		<xi:include href="csrss/csrss.rbuild" />
-	</directory>
-</if>
+<directory name="csrss">
+	<xi:include href="csrss/csrss.rbuild" />
+</directory>
 <directory name="win32k">
 	<xi:include href="win32k/win32k.rbuild" />
 </directory>
-- 
2.17.1