[ros-diffs] [sserapion] 44787: Fix Build.

Author: sserapion
Date: Mon Dec 28 04:09:37 2009
New Revision: 44787
URL: http://svn.reactos.org/svn/reactos?rev=44787&view=rev
Log:
Fix Build.
Modified:
    branches/ros-amd64-bringup/reactos/config-arm.template.rbuild
    branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild
    branches/ros-amd64-bringup/reactos/config.template.rbuild
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak
Modified: branches/ros-amd64-bringup/reactos/config-arm.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi…
==============================================================================
--- branches/ros-amd64-bringup/reactos/config-arm.template.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/config-arm.template.rbuild [iso-8859-1] Mon Dec 28
04:09:37 2009
@@ -90,4 +90,10 @@
 -->
 <property name="_ELF_" value="0" />
+<!--
+       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="1" />
+
 </group>
Modified: branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi…
==============================================================================
--- branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/config-ppc.template.rbuild [iso-8859-1] Mon Dec 28
04:09:37 2009
@@ -70,4 +70,10 @@
 -->
 <property name="_ELF_" value="0" />
+<!--
+       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="1" />
+
 </group>
Modified: branches/ros-amd64-bringup/reactos/config.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi…
==============================================================================
--- branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/config.template.rbuild [iso-8859-1] Mon Dec 28
04:09:37 2009
@@ -97,6 +97,12 @@
 <!--
        Whether to compile the multi processor versions for ntoskrnl and hal.
 -->
-<property name="BUILD_MP" value="1" />
+<property name="BUILD_MP" value="0" />
+
+<!--
+       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="1" />
 </group>
Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1]
Mon Dec 28 04:09:37 2009
@@ -263,7 +263,9 @@
        $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
-h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call
RBUILD_intermediate_path_noext,$(2)}_c.c $(2)
        $${checkpoint} $$@>$(NUL)
-${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_c.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,,${call
RBUILD_intermediate_path_noext,$(2)}_c.o}
+
+endef
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_SERVER_RULE
@@ -277,7 +279,9 @@
        $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
-h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call
RBUILD_intermediate_path_noext,$(2)}_s.c $(2)
        $${checkpoint} $$@>$(NUL)
-${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_s.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,,${call
RBUILD_intermediate_path_noext,$(2)}_s.o}
+
+endef
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_PROXY_RULE
@@ -291,7 +295,9 @@
        $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
-h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call
RBUILD_intermediate_path_noext,$(2)}_p.c $(2)
        $${checkpoint} $$@>$(NUL)
-${call RBUILD_CC,$(1),${call
RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call
RBUILD_intermediate_path_noext,$(2)}_p.o}endef
+${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,,${call
RBUILD_intermediate_path_noext,$(2)}_p.o}
+
+endef
 #(module, source, dependencies, cflags)
 define RBUILD_WIDL_INTERFACE_RULE