Merge trunk head (r43756)

[reactos.git] / reactos / lib / rtl / rtl.rbuild

diff --git a/reactos/lib/rtl/rtl.rbuild b/reactos/lib/rtl/rtl.rbuild
index 4636e1a..ab52ed1 100644 (file)
--- a/reactos/lib/rtl/rtl.rbuild
+++ b/reactos/lib/rtl/rtl.rbuild
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="rtl" type="staticlibrary">
        <define name="_NTOSKRNL_" />
-       <define name="__NO_CTYPE_INLINES" />
        <define name="NO_RTL_INLINES" />
        <define name="_NTSYSTEM_" />
        <define name="_NTDLLBUILD_" />
@@ -13,7 +12,6 @@
                        <file>except_asm.s</file>
                        <file>except.c</file>
                        <file>interlck.S</file>
-                       <file>random_asm.S</file>
                        <file>rtlswap.S</file>
                        <file>rtlmem.s</file>
                        <file>res_asm.s</file>
@@ -34,8 +32,19 @@
                <directory name="arm">
                        <file>debug_asm.S</file>
                </directory>
-        <file>mem.c</file>
-        <file>memgen.c</file>
+               <file>mem.c</file>
+               <file>memgen.c</file>
+       </if>
+       <if property="ARCH" value="amd64">
+               <directory name="amd64">
+                       <file>debug_asm.S</file>
+                       <file>except_asm.S</file>
+                       <file>interlck.S</file>
+                       <file>unwind.c</file>
+                       <file>stubs.c</file>
+               </directory>
+               <file>mem.c</file>
+               <file>memgen.c</file>
        </if>
        <directory name="austin">
                <file>avl.c</file>
@@ -45,6 +54,7 @@
        <file>access.c</file>
        <file>acl.c</file>
        <file>actctx.c</file>
+       <file>assert.c</file>
        <file>atom.c</file>
        <file>bitmap.c</file>
        <file>bootdata.c</file>
@@ -101,5 +111,5 @@
        <pch>rtl.h</pch>
        -->
        <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-       <compilerflag>-fno-unit-at-a-time</compilerflag>
+       <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>