- Fix build with neither KDBG or _WINKD_ defined -- ReactOS KD wrapper uses the safe...

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

diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index a33596b..e5782b1 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -3,12 +3,9 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <bootstrap installbase="$(CDOUTPUT)" />
        <importlibrary definition="ntoskrnl.pspec" />
-       <define name="_DISABLE_TIDENTS" />
        <define name="__NTOSKRNL__" />
        <define name="_NTOSKRNL_" />
        <define name="_NTSYSTEM_" />
-       <define name="__NO_CTYPE_INLINES" />
-       <define name="WIN9X_COMPAT_SPINLOCK" />
        <define name="_IN_KERNEL_" />
        <if property="_WINKD_" value="1">
                <define name="_WINKD_" />
@@ -89,22 +86,6 @@
                                <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>
@@ -115,6 +96,7 @@
                <file>eventobj.c</file>
                <file>except.c</file>
                <file>freeldr.c</file>
+               <file>freeze.c</file>
                <file>gate.c</file>
                <file>gmutex.c</file>
                <file>ipi.c</file>
@@ -144,11 +126,6 @@
                                <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>
@@ -295,13 +272,15 @@
                        <file>pnproot.c</file>
                </directory>
        </directory>
-       <directory name="kd">
-               <if property="ARCH" value="i386">
-                       <directory name="i386">
-                               <file>kdmemsup.c</file>
-                       </directory>
-               </if>
-       </directory>
+       <if property="_WINKD_" value="0">
+               <directory name="kd">
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>kdmemsup.c</file>
+                               </directory>
+                       </if>
+               </directory>
+       </if>
        <if property="_WINKD_" value="0">
                <directory name="kdbg">
                        <if property="ARCH" value="i386">
@@ -317,18 +296,11 @@
                                </directory>
                        </if>
                        <if property="KDBG" value="1">
-                               <ifnot property="ARCH" value="amd64">
-                                       <file>kdb.c</file>
-                                       <file>kdb_cli.c</file>
-                                       <file>kdb_expr.c</file>
-                               </ifnot>
+                               <file>kdb.c</file>
+                               <file>kdb_cli.c</file>
+                               <file>kdb_expr.c</file>
                                <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>
@@ -345,11 +317,6 @@
                                </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>
@@ -357,6 +324,21 @@
        </if>
        <if property="_WINKD_" value ="1">
                <directory name="kd64">
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>kdx86.c</file>
+                               </directory>
+                       </if>
+                       <if property="ARCH" value="amd64">
+                               <directory name="amd64">
+                                       <file>kdx64.c</file>
+                               </directory>
+                       </if>
+                       <if property="ARCH" value="arm">
+                               <directory name="arm">
+                                       <file>kdarm.c</file>
+                               </directory>
+                       </if>
                        <file>kdapi.c</file>
                        <file>kdbreak.c</file>
                        <file>kddata.c</file>
@@ -393,29 +375,46 @@
                                <file>page.c</file>
                        </directory>
                </if>
-               <if property="ARCH" value="amd64">
-                       <directory name="amd64">
-                               <file>page.c</file>
-                       </directory>
-               </if>
+               <directory name="ARM3">
+                       <if property="ARCH" value="i386">
+                               <directory name="i386">
+                                       <file>init.c</file>
+                               </directory>
+                       </if>
+                       <if property="ARCH" value="arm">
+                               <directory name="arm">
+                                       <file>init.c</file>
+                               </directory>
+                       </if>
+                       <file>contmem.c</file>
+                       <file>drvmgmt.c</file>
+                       <file>dynamic.c</file>
+                       <file>expool.c</file>
+                       <file>hypermap.c</file>
+                       <file>iosup.c</file>
+                       <file>mdlsup.c</file>
+                       <file>mmsup.c</file>
+                       <file>ncache.c</file>
+                       <file>pagfault.c</file>
+                       <file>pool.c</file>
+                       <file>procsup.c</file>
+                       <file>syspte.c</file>
+                       <file>virtual.c</file>
+               </directory>
                <file>anonmem.c</file>
                <file>balance.c</file>
-               <file>cont.c</file>
-               <file>drvlck.c</file>
+               <file>dbgpool.c</file>
                <file>freelist.c</file>
-               <file>iospace.c</file>
-               <file>kmap.c</file>
                <file>marea.c</file>
-               <file>mdlsup.c</file>
-               <file>mm.c</file>
+               <if property="_WINKD_" value ="1">
+                       <file>mmdbg.c</file>
+               </if>
+               <file>mmfault.c</file>
                <file>mminit.c</file>
                <file>mpw.c</file>
-               <file>ncache.c</file>
-               <file>npool.c</file>
                <file>pagefile.c</file>
                <file>pageop.c</file>
                <file>pe.c</file>
-               <file>physical.c</file>
                <file>pool.c</file>
                <file>ppool.c</file>
                <file>procsup.c</file>
@@ -423,9 +422,7 @@
                <file>rmap.c</file>
                <file>section.c</file>
                <file>sysldr.c</file>
-               <file>verifier.c</file>
                <file>virtual.c</file>
-               <file>wset.c</file>
                <if property="_ELF_" value="1">
                        <file>elf32.c</file>
                        <file>elf64.c</file>
@@ -451,6 +448,7 @@
                <if property="ARCH" value="i386">
                        <directory name="i386">
                                <file>psctx.c</file>
+                               <file>psldt.c</file>
                        </directory>
                </if>
                <if property="ARCH" value="arm">
@@ -458,11 +456,6 @@
                                <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>
@@ -514,5 +507,5 @@
        <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript>
 
        <!-- 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>
 </group>