Merge trunk head (r41474)

[reactos.git] / reactos / ntoskrnl / ntoskrnl-generic.rbuild

diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index c1cbe68..9b44cb2 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -88,6 +88,22 @@
                                <file>ctxhelp.S</file>
                        </directory>
                </if>
+               <if property="ARCH" value="amd64">
+                       <directory name="amd64">
+                               <file first="true">boot.S</file>
+                               <file>context.c</file>
+                               <file>cpu.c</file>
+                               <file>ctxswitch.S</file>
+                               <file>except.c</file>
+                               <file>interrupt.c</file>
+                               <file>irql.c</file>
+                               <file>kiinit.c</file>
+                               <file>spinlock.c</file>
+                               <file>stubs.c</file>
+                               <file>thrdini.c</file>
+                               <file>trap.S</file>
+                       </directory>
+               </if>
                <file>apc.c</file>
                <file>balmgr.c</file>
                <file>bug.c</file>
@@ -127,6 +143,11 @@
                                <file>cmhardwr.c</file>
                        </directory>
                </if>
+               <if property="ARCH" value="amd64">
+                       <directory name="i386">
+                               <file>cmhardwr.c</file>
+                       </directory>
+               </if>
                <if property="ARCH" value="arm">
                        <directory name="arm">
                                <file>cmhardwr.c</file>
@@ -177,6 +198,11 @@
                                <file>ioport.S</file>
                        </directory>
                </if>
+               <if property="ARCH" value="amd64">
+                       <directory name="amd64">
+                               <file>fastinterlck.c</file>
+                       </directory>
+               </if>
                <file>atom.c</file>
                <file>callback.c</file>
                <file>dbgctrl.c</file>
@@ -295,11 +321,18 @@
                                </directory>
                        </if>
                        <if property="KDBG" value="1">
-                               <file>kdb.c</file>
-                               <file>kdb_cli.c</file>
-                               <file>kdb_expr.c</file>
+                               <ifnot property="ARCH" value="amd64">
+                                       <file>kdb.c</file>
+                                       <file>kdb_cli.c</file>
+                                       <file>kdb_expr.c</file>
+                               </ifnot>
                                <file>kdb_keyboard.c</file>
                                <file>kdb_serial.c</file>
+                               <if property="ARCH" value="amd64">
+                                       <directory name="amd64">
+                                               <file>kdb.c</file>
+                                       </directory>
+                               </if>
                        </if>
                        <if property="DBG_OR_KDBG" value="true">
                                <file>kdb_symbols.c</file>
@@ -316,6 +349,11 @@
                                </if>
                                <file>kdbg.c</file>
                        </directory>
+                       <if property="ARCH" value="amd64">
+                               <directory name="amd64">
+                                       <file>kd.c</file>
+                               </directory>
+                       </if>
                        <file>kdinit.c</file>
                        <file>kdio.c</file>
                        <file>kdmain.c</file>
@@ -330,6 +368,16 @@
                        <file>kdlock.c</file>
                        <file>kdprint.c</file>
                        <file>kdtrap.c</file>
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>kd-i386.c</file>
+                               </directory>
+                       </if>
+                       <if property="ARCH" value="amd64">
+                               <directory name="amd64">
+                                       <file>kd-amd64.c</file>
+                               </directory>
+                       </if>
                </directory>
        </if>
        <directory name="lpc">
@@ -359,6 +407,11 @@
                                <file>page.c</file>
                        </directory>
                </if>
+               <if property="ARCH" value="amd64">
+                       <directory name="amd64">
+                               <file>page.c</file>
+                       </directory>
+               </if>
                <file>anonmem.c</file>
                <file>balance.c</file>
                <file>cont.c</file>
@@ -421,6 +474,11 @@
                                <file>psctx.c</file>
                        </directory>
                </if>
+               <if property="ARCH" value="amd64">
+                       <directory name="amd64">
+                               <file>psctx.c</file>
+                       </directory>
+               </if>
                <file>debug.c</file>
                <file>job.c</file>
                <file>kill.c</file>