From 545615df47dbc7dc64e85bdbdb85cfce1965fcc6 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 10 Nov 2014 19:47:28 +0000
Subject: [PATCH] [CMAKE][NTVDM] * There is no folder named ntvdm inside ntvdm.
 * Improve some inclusions (avoid ../ types).

svn path=/trunk/; revision=65369
---
 reactos/subsystems/ntvdm/CMakeLists.txt          | 5 +----
 reactos/subsystems/ntvdm/bios/bios32/bios32.c    | 4 ++--
 reactos/subsystems/ntvdm/bios/bios32/bios32.h    | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/bios32p.h   | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/moubios32.h | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/vidbios32.c | 2 +-
 reactos/subsystems/ntvdm/bios/bios32/vidbios32.h | 2 +-
 reactos/subsystems/ntvdm/hardware/vga.c          | 2 +-
 10 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/reactos/subsystems/ntvdm/CMakeLists.txt b/reactos/subsystems/ntvdm/CMakeLists.txt
index a8b2aff73c9..add151f4985 100644
--- a/reactos/subsystems/ntvdm/CMakeLists.txt
+++ b/reactos/subsystems/ntvdm/CMakeLists.txt
@@ -1,8 +1,5 @@
 
-include_directories(
-    ${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486
-    ntvdm)
-
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486)
 spec2def(ntvdm.exe ntvdm.spec)
 
 list(APPEND SOURCE
diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/ntvdm/bios/bios32/bios32.c
index 069aded0309..bc8095a960b 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32.c
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32.c
@@ -18,8 +18,8 @@
 #include "cpu/bop.h"
 #include "int32.h"
 
-#include "../bios.h"
-#include "../rom.h"
+#include <bios/bios.h>
+#include <bios/rom.h>
 #include "bios32.h"
 #include "bios32p.h"
 #include "kbdbios32.h"
diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32.h b/reactos/subsystems/ntvdm/bios/bios32/bios32.h
index 4bd5d30b15c..1fb66aef87a 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32.h
@@ -12,7 +12,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"
-// #include "../bios.h"
+// #include <bios/bios.h>
 
 /* DEFINES ********************************************************************/
 
diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32p.h b/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
index 060f0f71d76..9e70119bb1b 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
@@ -12,7 +12,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"
-#include "../bios.h"
+#include <bios/bios.h>
 
 /**/ #include "int32.h" /**/
 
diff --git a/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
index db9ba5aa59d..16ec1651c63 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
+++ b/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
@@ -15,7 +15,7 @@
 #include "int32.h"
 
 #include "kbdbios32.h"
-#include "../kbdbios.h"
+#include <bios/kbdbios.h>
 #include "bios32p.h"
 
 #include "io.h"
diff --git a/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h b/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
index b5f9c145a12..427945e368a 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
@@ -41,6 +41,6 @@
 BOOLEAN KbdBios32Initialize(VOID);
 VOID KbdBios32Cleanup(VOID);
 
-#endif // _KBDBIOS32_H_
+#endif /* _KBDBIOS32_H_ */
 
 /* EOF */
diff --git a/reactos/subsystems/ntvdm/bios/bios32/moubios32.h b/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
index 9af6d46f786..de2586a7500 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
@@ -77,6 +77,6 @@ VOID MouseBiosUpdateButtons(WORD ButtonStatus);
 BOOLEAN MouseBios32Initialize(VOID);
 VOID MouseBios32Cleanup(VOID);
 
-#endif // _MOUBIOS32_H_
+#endif /* _MOUBIOS32_H_ */
 
 /* EOF */
diff --git a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
index 97783815f3a..a647562846e 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
+++ b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
@@ -16,7 +16,7 @@
 #include "int32.h"
 
 #include "vidbios32.h"
-#include "../vidbios.h"
+#include <bios/vidbios.h>
 #include "bios32p.h"
 
 /* PUBLIC FUNCTIONS ***********************************************************/
diff --git a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
index 46b853bb61e..0cdea6e7f1c 100644
--- a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
@@ -24,6 +24,6 @@
 BOOLEAN VidBios32Initialize(VOID);
 VOID VidBios32Cleanup(VOID);
 
-#endif // _VIDBIOS32_H_
+#endif /* _VIDBIOS32_H_ */
 
 /* EOF */
diff --git a/reactos/subsystems/ntvdm/hardware/vga.c b/reactos/subsystems/ntvdm/hardware/vga.c
index cb96ee00300..c45b2455a58 100644
--- a/reactos/subsystems/ntvdm/hardware/vga.c
+++ b/reactos/subsystems/ntvdm/hardware/vga.c
@@ -12,7 +12,7 @@
 
 #include "emulator.h"
 #include "vga.h"
-#include "../bios/vidbios.h"
+#include <bios/vidbios.h>
 
 #include "io.h"