Sync to trunk head (r42241)

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

diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index 3cfab3d..de897e8 100644 (file)
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -1,79 +1,49 @@
 <?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-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:include href="config-arm.rbuild">
                <xi:fallback>
                        <xi:include href="config-arm.template.rbuild" />
                </xi:fallback>
        </xi:include>
 
-       <xi:include href="baseaddress.rbuild" />
-
-       <define name="__REACTOS__" />
+    <xi:include href="ReactOS-generic.rbuild" />
+                
+    <!-- <define name="_M_ARM" /> Already defined by toolchain -->
        <define name="_ARM_" />
        <define name="__arm__" />
-
-       <if property="DBG" value="1">
-               <define name="DBG">1</define>
-               <define name="_SEH_ENABLE_TRACE" />
-               <property name="DBG_OR_KDBG" value="true" />
-       </if>
-       <if property="KDBG" value="1">
-               <define name="KDBG">1</define>
-               <property name="DBG_OR_KDBG" value="true" />
-       </if>
-       
-       <include>.</include>
-       <include>include</include>
-       <include root="intermediate">include</include>
-       <include>include/psdk</include>
-       <include root="intermediate">include/psdk</include>
-       <include>include/dxsdk</include>
-       <include root="intermediate">include/dxsdk</include>
-       <include>include/crt</include>
-       <include>include/crt/mingw32</include>
-       <include>include/ddk</include>
-       <include>include/GL</include>
-       <include>include/ndk</include>
-       <include>include/reactos</include>
-       <include root="intermediate">include/reactos</include>
-       <include root="intermediate">include/reactos/mc</include>
-       <include>include/reactos/libs</include>
-       <include>include/reactos/arm</include>
-
-       <property name="WINEBUILD_FLAGS" value="--kill-at"/>
-       <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
+       <define name="TARGET_arm" host="true" />
+    
+    <define name="USE_COMPILER_EXCEPTIONS" />
+    
+    <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/>
+    <property name="WINEBUILD_FLAGS" value="--kill-at"/>
+        
+    <include>include/reactos/arm</include>
 
        <if property="SARCH" value="versatile">
                <define name="BOARD_CONFIG_VERSATILE"/>
        </if>
 
-       <if property="OPTIMIZE" value="1">
-               <compilerflag>-Os</compilerflag>
-               <compilerflag>-ftracer</compilerflag>
-       </if>
-       <if property="OPTIMIZE" value="2">
-               <compilerflag>-Os</compilerflag>
-       </if>
-       <if property="OPTIMIZE" value="3">
-               <compilerflag>-O1</compilerflag>
-       </if>
-       <if property="OPTIMIZE" value="4">
-               <compilerflag>-O2</compilerflag>
-       </if>
-       <if property="OPTIMIZE" value="5">
-               <compilerflag>-O3</compilerflag>
-       </if>
+       <group compilerset="gcc">
+               <if property="OPTIMIZE" value="1">
+                       <compilerflag>-ftracer</compilerflag>
+               </if>
+        <compilerflag>-Wno-attributes</compilerflag>
+       </group>
+
+    
+       <define name="__MSVCRT__"/> <!-- DUBIOUS -->
+    
+       <group linkerset="ld">
+        <linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
+        <linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
+       </group>
 
-       <compilerflag>-Wno-attributes</compilerflag>
-       <compilerflag>-fno-strict-aliasing</compilerflag>
-       <linkerflag>-s</linkerflag>
-       <linkerflag>-static</linkerflag>
-       
        <directory name="media">
                <directory name="nls">
                        <xi:include href="media/nls/nls.rbuild" />
-               </directory>    
+               </directory>
        </directory>
        <directory name="lib">
                <directory name="drivers">
@@ -114,10 +84,19 @@
                                <xi:include href="lib/sdk/crt/crt.rbuild" />
                                <xi:include href="lib/sdk/crt/libcntpr.rbuild" />
                        </directory>
+                       <directory name="nt">
+                               <xi:include href="lib/sdk/nt/nt.rbuild" />
+                       </directory>
                        <directory name="wdmguid">
                                <xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" />
                        </directory>
                </directory>
+               <directory name="ntdllsys">
+                       <xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
+               </directory>
+               <directory name="smlib">
+                       <xi:include href="lib/smlib/smlib.rbuild" />
+               </directory>
        </directory>
        <directory name="include">
                <xi:include href="include/directory.rbuild" />
@@ -165,5 +144,17 @@
                                <xi:include href="drivers/base/bootvid/bootvid.rbuild" />
                        </directory>
                </directory>
-       </directory>    
+       </directory>
+       <directory name="dll">
+               <directory name="ntdll">
+                       <xi:include href="dll/ntdll/ntdll.rbuild" />
+               </directory>
+       </directory>
+       <directory name="base">
+               <directory name="system">
+            <directory name="smss">
+                <xi:include href="base/system/smss/smss.rbuild" />
+            </directory>
+               </directory>
+       </directory>
 </project>