Added more includes to cmake file

ergo720 · Aug 11, 2024 · e64bd06 · e64bd06
1 parent 0bac12a
commit e64bd06
Show file tree

Hide file tree

Showing 65 changed files with 158 additions and 145 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,6 +41,19 @@ add_compile_options(
 include_directories(
  "${NBOXKRNL_ROOT_DIR}/import/pdclib/include"
  "${NBOXKRNL_ROOT_DIR}/import/pdclib/platform/xbox/include"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/dbg"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/ex"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/hal"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/io"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/ke"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/ki"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/mm"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/nt"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/ob"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/ps"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/rtl"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/xc"
+ "${NBOXKRNL_ROOT_DIR}/nboxkrnl/xe"
 )
 
 link_directories(

diff --git a/nboxkrnl/ex/event.cpp b/nboxkrnl/ex/event.cpp
@@ -2,7 +2,7 @@
  * ergo720                Copyright (c) 2024
  */
 
-#include "..\ex\ex.hpp"
+#include "ex.hpp"
 
 
 EXPORTNUM(16) OBJECT_TYPE ExEventObjectType = {

diff --git a/nboxkrnl/ex/ex.cpp b/nboxkrnl/ex/ex.cpp
@@ -4,9 +4,9 @@
  */
 
 #include "ex.hpp"
-#include "..\ke\ke.hpp"
-#include "..\ob\ob.hpp"
-#include "..\rtl\rtl.hpp"
+#include "ke.hpp"
+#include "ob.hpp"
+#include "rtl.hpp"
 #include <string.h>
 
 #define XC_END_MARKER (XC_VALUE_INDEX)-1

diff --git a/nboxkrnl/ex/ex.hpp b/nboxkrnl/ex/ex.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "..\nt\zw.hpp"
-#include "..\ob\ob.hpp"
+#include "zw.hpp"
+#include "ob.hpp"
 
 #define TIME_ZONE_NAME_LENGTH 4
 

diff --git a/nboxkrnl/ex/exp_sup.cpp b/nboxkrnl/ex/exp_sup.cpp
@@ -3,8 +3,8 @@
  */
 
 #include "ex.hpp"
-#include "..\rtl\rtl.hpp"
-#include "..\rtl\exp_sup.hpp"
+#include "rtl.hpp"
+#include "exp_sup.hpp"
 
 
 EXPORTNUM(26) __declspec(naked) VOID XBOXAPI ExRaiseException

diff --git a/nboxkrnl/ex/mutant.cpp b/nboxkrnl/ex/mutant.cpp
@@ -4,7 +4,7 @@
 
 
 #include "ex.hpp"
-#include "..\rtl\rtl.hpp"
+#include "rtl.hpp"
 
 
 VOID XBOXAPI ExpDeleteMutant(PVOID Object)

diff --git a/nboxkrnl/ex/pool.cpp b/nboxkrnl/ex/pool.cpp
@@ -2,9 +2,9 @@
  * ergo720                Copyright (c) 2023
  */
 
-#include "..\mm\mm.hpp"
-#include "..\mm\mi.hpp"
-#include "..\ex\ex.hpp"
+#include "mm.hpp"
+#include "mi.hpp"
+#include "ex.hpp"
 #include <assert.h>
 
 

diff --git a/nboxkrnl/ex/rwlock.cpp b/nboxkrnl/ex/rwlock.cpp
@@ -4,7 +4,7 @@
  * Fisherman166           Copyright (c) 2020
  */
 
-#include "..\ex\ex.hpp"
+#include "ex.hpp"
 
 
 // Source: Cxbx-Reloaded

diff --git a/nboxkrnl/hal/hal.cpp b/nboxkrnl/hal/hal.cpp
@@ -4,7 +4,7 @@
 
 #include "hal.hpp"
 #include "halp.hpp"
-#include "..\rtl\rtl.hpp"
+#include "rtl.hpp"
 
 
  // Global list of routines executed during a reboot

diff --git a/nboxkrnl/hal/hal.hpp b/nboxkrnl/hal/hal.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "..\types.hpp"
-#include "..\ke\ke.hpp"
+#include "ke.hpp"
 
 
 using PHAL_SHUTDOWN_NOTIFICATION = VOID(XBOXAPI *)(

diff --git a/nboxkrnl/hal/halp.hpp b/nboxkrnl/hal/halp.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "..\types.hpp"
-#include "..\ki\ki.hpp"
-#include "..\ki\hw_exp.hpp"
+#include "ki.hpp"
+#include "hw_exp.hpp"
 
  // PIC i/o ports
 #define PIC_MASTER_CMD          0x20

diff --git a/nboxkrnl/hal/interrupt.cpp b/nboxkrnl/hal/interrupt.cpp
@@ -4,7 +4,7 @@
 
 #include "hal.hpp"
 #include "halp.hpp"
-#include "..\rtl\rtl.hpp"
+#include "rtl.hpp"
 #include <assert.h>
 
 

diff --git a/nboxkrnl/io/cdrom/cdrom.cpp b/nboxkrnl/io/cdrom/cdrom.cpp
@@ -3,8 +3,8 @@
  */
 
 #include "cdrom.hpp"
-#include "..\io.hpp"
-#include "..\..\ob\obp.hpp"
+#include "io.hpp"
+#include "obp.hpp"
 
 
 static DRIVER_OBJECT CdromDriverObject = {

diff --git a/nboxkrnl/io/cdrom/xiso.cpp b/nboxkrnl/io/cdrom/xiso.cpp
@@ -4,7 +4,7 @@
 
 #include "cdrom.hpp"
 #include "xiso.hpp"
-#include "..\..\ob\obp.hpp"
+#include "obp.hpp"
 #include <string.h>
 #include <assert.h>
 

diff --git a/nboxkrnl/io/cdrom/xiso.hpp b/nboxkrnl/io/cdrom/xiso.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "..\..\io\io.hpp"
-#include "..\..\rtl\rtl.hpp"
-#include "..\..\ex\ex.hpp"
+#include "io.hpp"
+#include "rtl.hpp"
+#include "ex.hpp"
 
 
 struct XISO_FILE_INFO {

diff --git a/nboxkrnl/io/fsc.hpp b/nboxkrnl/io/fsc.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "..\mm\mi.hpp"
-#include "..\io\hdd\fatx.hpp"
+#include "mi.hpp"
+#include "hdd\fatx.hpp"
 
 
 struct FSCACHE_ELEMENT {

diff --git a/nboxkrnl/io/hdd/fatx.cpp b/nboxkrnl/io/hdd/fatx.cpp
@@ -3,9 +3,9 @@
  */
 
 #include "hdd.hpp"
-#include "..\..\io\fsc.hpp"
-#include "..\..\ob\obp.hpp"
-#include "..\..\dbg\dbg.hpp"
+#include "fsc.hpp"
+#include "obp.hpp"
+#include "dbg.hpp"
 #include <string.h>
 #include <assert.h>
 

diff --git a/nboxkrnl/io/hdd/fatx.hpp b/nboxkrnl/io/hdd/fatx.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "..\..\io\io.hpp"
-#include "..\..\ex\ex.hpp"
+#include "io.hpp"
+#include "ex.hpp"
 
 #define FATX_VOLUME_DISMOUNTED 2
 #define FATX_MAX_FILE_NAME_LENGTH 42

diff --git a/nboxkrnl/io/hdd/hdd.cpp b/nboxkrnl/io/hdd/hdd.cpp
@@ -3,11 +3,11 @@
  */
 
 #include "hdd.hpp"
-#include "..\..\ob\obp.hpp"
-#include "..\..\ex\ex.hpp"
-#include "..\..\nt\nt.hpp"
-#include "..\..\rtl\rtl.hpp"
-#include "..\..\dbg\dbg.hpp"
+#include "obp.hpp"
+#include "ex.hpp"
+#include "nt.hpp"
+#include "rtl.hpp"
+#include "dbg.hpp"
 #include <assert.h>
 #include <string.h>
 

diff --git a/nboxkrnl/io/io.cpp b/nboxkrnl/io/io.cpp
@@ -2,10 +2,10 @@
  * ergo720                Copyright (c) 2023
  */
 
-#include "..\ex\ex.hpp"
-#include "..\rtl\rtl.hpp"
-#include "..\ob\obp.hpp"
-#include "..\nt\nt.hpp"
+#include "ex.hpp"
+#include "rtl.hpp"
+#include "obp.hpp"
+#include "nt.hpp"
 #include "cdrom\cdrom.hpp"
 #include "hdd\hdd.hpp"
 #include <string.h>

diff --git a/nboxkrnl/io/io.hpp b/nboxkrnl/io/io.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "iop.hpp"
-#include "..\ob\ob.hpp"
+#include "ob.hpp"
 
 
 #define IoLock() KeRaiseIrqlToDpcLevel()

diff --git a/nboxkrnl/io/iop.cpp b/nboxkrnl/io/iop.cpp
@@ -5,7 +5,7 @@
 #include "iop.hpp"
 #include "hdd\fatx.hpp"
 #include "cdrom\xiso.hpp"
-#include "..\nt\nt.hpp"
+#include "nt.hpp"
 
 
 const UCHAR IopValidFsInformationQueries[] = {

diff --git a/nboxkrnl/io/iop.hpp b/nboxkrnl/io/iop.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "..\ob\ob.hpp"
-#include "..\ke\ke.hpp"
+#include "ob.hpp"
+#include "ke.hpp"
 
 
 #define OPEN_PACKET_PATTERN              0xbeaa0251

diff --git a/nboxkrnl/ke/apc.cpp b/nboxkrnl/ke/apc.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "ke.hpp"
-#include "..\hal\hal.hpp"
-#include "..\rtl\rtl.hpp"
+#include "hal.hpp"
+#include "rtl.hpp"
 
 
 static BOOLEAN KiInsertQueueApc(PKAPC Apc, KPRIORITY Increment)

diff --git a/nboxkrnl/ke/bug.cpp b/nboxkrnl/ke/bug.cpp
@@ -3,8 +3,8 @@
  */
 
 #include "ke.hpp"
-#include "..\hal\halp.hpp"
-#include "..\dbg\dbg.hpp"
+#include "halp.hpp"
+#include "dbg.hpp"
 
 
 EXPORTNUM(95) VOID XBOXAPI KeBugCheck

diff --git a/nboxkrnl/ke/dpc.cpp b/nboxkrnl/ke/dpc.cpp
@@ -4,8 +4,8 @@
  */
 
 #include "ke.hpp"
-#include "..\ki\ki.hpp"
-#include "..\hal\hal.hpp"
+#include "ki.hpp"
+#include "hal.hpp"
 
 
 // Source: Cxbx-Reloaded

diff --git a/nboxkrnl/ke/event.cpp b/nboxkrnl/ke/event.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "ke.hpp"
-#include "..\rtl\rtl.hpp"
+#include "rtl.hpp"
 
 
 EXPORTNUM(108) VOID XBOXAPI KeInitializeEvent

diff --git a/nboxkrnl/ke/interrupt.cpp b/nboxkrnl/ke/interrupt.cpp
@@ -2,9 +2,9 @@
  * ergo720                Copyright (c) 2024
  */
 
-#include "..\ki\ki.hpp"
-#include "..\hal\halp.hpp"
-#include "..\hal\hal.hpp"
+#include "ki.hpp"
+#include "halp.hpp"
+#include "hal.hpp"
 #include <string.h>
 #include <assert.h>
 

diff --git a/nboxkrnl/ke/irql.cpp b/nboxkrnl/ke/irql.cpp
@@ -3,9 +3,9 @@
  */
 
 #include "ke.hpp"
-#include "..\ki\ki.hpp"
-#include "..\hal\hal.hpp"
-#include "..\hal\halp.hpp"
+#include "ki.hpp"
+#include "hal.hpp"
+#include "halp.hpp"
 
 
 EXPORTNUM(103) KIRQL XBOXAPI KeGetCurrentIrql()

diff --git a/nboxkrnl/ke/kernel.cpp b/nboxkrnl/ke/kernel.cpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "..\ki\ki.hpp"
+#include "ki.hpp"
 #include "..\kernel.hpp"
 #include <assert.h>
 

diff --git a/nboxkrnl/ke/mutant.cpp b/nboxkrnl/ke/mutant.cpp
@@ -2,8 +2,8 @@
  * ergo720                Copyright (c) 2023
  */
 
-#include "..\ki\ki.hpp"
-#include "..\ex\ex.hpp"
+#include "ki.hpp"
+#include "ex.hpp"
 
 
 EXPORTNUM(110) VOID XBOXAPI KeInitializeMutant

diff --git a/nboxkrnl/ke/semaphore.cpp b/nboxkrnl/ke/semaphore.cpp
@@ -5,7 +5,7 @@
 
 #include "ke.hpp"
 #include "..\kernel.hpp"
-#include "..\ex\ex.hpp"
+#include "ex.hpp"
 
 
 // Source: Cxbx-Reloaded

diff --git a/nboxkrnl/ke/thread.cpp b/nboxkrnl/ke/thread.cpp
@@ -4,13 +4,13 @@
  */
 
 #include "ke.hpp"
-#include "..\ki\ki.hpp"
+#include "ki.hpp"
 #include "..\kernel.hpp"
-#include "..\mm\mm.hpp"
-#include "..\hal\halp.hpp"
-#include "..\rtl\rtl.hpp"
-#include "..\ps\ps.hpp"
-#include "..\hal\hal.hpp"
+#include "mm.hpp"
+#include "halp.hpp"
+#include "rtl.hpp"
+#include "ps.hpp"
+#include "hal.hpp"
 #include <string.h>
 #include <assert.h>