[SHELL32]

[reactos.git] / reactos / ReactOS-i386.rbuild

diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index 59f4284..0cf26e1 100644 (file)
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:include href="config.rbuild">
                <xi:fallback>
                        <xi:include href="config.template.rbuild" />
@@ -24,9 +24,13 @@
                        <compilerflag>-ftracer</compilerflag>
                        <compilerflag>-momit-leaf-frame-pointer</compilerflag>
                </if>
+               <compilerflag>-fms-extensions</compilerflag>
                <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
                <compilerflag compiler="midl">-m32 --win32</compilerflag>
                <compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+               <compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag>
+               <compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag>
+               <compilerflag compiler="cc,cxx">-fno-omit-frame-pointer</compilerflag>
                <compilerflag compiler="as">-gstabs+</compilerflag>
        </group>
 
@@ -36,18 +40,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>