Revert 45697:

"* Disable compiling usermode components for now."

svn path=/branches/header-work/; revision=46151
This commit is contained in:
Timo Kreuzer
2010-03-12 21:28:06 +00:00
parent 350dfd1b9d
commit 83d81567a2
8 changed files with 26 additions and 50 deletions
+6 -9
View File
@@ -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>
-6
View File
@@ -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>
+3 -6
View File
@@ -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>
+3 -7
View File
@@ -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>
+1 -3
View File
@@ -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>
+7 -9
View File
@@ -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>
<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>
+3 -5
View File
@@ -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>
+3 -5
View File
@@ -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>