[CMAKE][NTVDM]

* There is no folder named ntvdm inside ntvdm.
* Improve some inclusions (avoid ../ types).

svn path=/trunk/; revision=65369

diff --git a/reactos/subsystems/ntvdm/CMakeLists.txt b/reactos/subsystems/ntvdm/CMakeLists.txt
index a8b2aff..add151f 100644 (file)
--- 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
 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 069aded..bc8095a 100644 (file)
--- 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 "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"
 #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 4bd5d30..1fb66ae 100644 (file)
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32.h
@@ -12,7 +12,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"

-// #include "../bios.h"
+// #include <bios/bios.h>

 
 /* DEFINES ********************************************************************/
 
 
 /* DEFINES ********************************************************************/
 

diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32p.h b/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
index 060f0f7..9e70119 100644 (file)
--- a/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
+++ b/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
@@ -12,7 +12,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"
 /* INCLUDES *******************************************************************/
 
 #include "ntvdm.h"

-#include "../bios.h"
+#include <bios/bios.h>

 
 /**/ #include "int32.h" /**/
 
 
 /**/ #include "int32.h" /**/
 

diff --git a/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
index db9ba5a..16ec165 100644 (file)
--- 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 "int32.h"
 
 #include "kbdbios32.h"

-#include "../kbdbios.h"
+#include <bios/kbdbios.h>

 #include "bios32p.h"
 
 #include "io.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 b5f9c14..427945e 100644 (file)
--- 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);
 
 BOOLEAN KbdBios32Initialize(VOID);
 VOID KbdBios32Cleanup(VOID);
 

-#endif // _KBDBIOS32_H_
+#endif /* _KBDBIOS32_H_ */

 
 /* EOF */
 
 /* EOF */

diff --git a/reactos/subsystems/ntvdm/bios/bios32/moubios32.h b/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
index 9af6d46..de2586a 100644 (file)
--- 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);
 
 BOOLEAN MouseBios32Initialize(VOID);
 VOID MouseBios32Cleanup(VOID);
 

-#endif // _MOUBIOS32_H_
+#endif /* _MOUBIOS32_H_ */

 
 /* EOF */
 
 /* EOF */

diff --git a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
index 9778381..a647562 100644 (file)
--- 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 "int32.h"
 
 #include "vidbios32.h"

-#include "../vidbios.h"
+#include <bios/vidbios.h>

 #include "bios32p.h"
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 #include "bios32p.h"
 
 /* PUBLIC FUNCTIONS ***********************************************************/

diff --git a/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h b/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
index 46b853b..0cdea6e 100644 (file)
--- 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);
 
 BOOLEAN VidBios32Initialize(VOID);
 VOID VidBios32Cleanup(VOID);
 

-#endif // _VIDBIOS32_H_
+#endif /* _VIDBIOS32_H_ */

 
 /* EOF */
 
 /* EOF */

diff --git a/reactos/subsystems/ntvdm/hardware/vga.c b/reactos/subsystems/ntvdm/hardware/vga.c
index cb96ee0..c45b245 100644 (file)
--- 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 "emulator.h"
 #include "vga.h"

-#include "../bios/vidbios.h"
+#include <bios/vidbios.h>

 
 #include "io.h"
 
 
 #include "io.h"