Author: akhaldi
Date: Mon Nov 10 19:47:28 2014
New Revision: 65369
URL: http://svn.reactos.org/svn/reactos?rev=65369&view=rev
Log:
[CMAKE][NTVDM]
* There is no folder named ntvdm inside ntvdm.
* Improve some inclusions (avoid ../ types).
Modified:
trunk/reactos/subsystems/ntvdm/CMakeLists.txt
trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c
trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.h
trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
trunk/reactos/subsystems/ntvdm/hardware/vga.c
Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeLists.txt?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Mon Nov 10
19:47:28 2014
@@ -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
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Mon Nov 10
19:47:28 2014
@@ -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"
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.h?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.h [iso-8859-1] Mon Nov 10
19:47:28 2014
@@ -12,7 +12,7 @@
/* INCLUDES
*******************************************************************/
#include "ntvdm.h"
-// #include "../bios.h"
+// #include <bios/bios.h>
/* DEFINES
********************************************************************/
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -12,7 +12,7 @@
/* INCLUDES
*******************************************************************/
#include "ntvdm.h"
-#include "../bios.h"
+#include <bios/bios.h>
/**/ #include "int32.h" /**/
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -15,7 +15,7 @@
#include "int32.h"
#include "kbdbios32.h"
-#include "../kbdbios.h"
+#include <bios/kbdbios.h>
#include "bios32p.h"
#include "io.h"
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -41,6 +41,6 @@
BOOLEAN KbdBios32Initialize(VOID);
VOID KbdBios32Cleanup(VOID);
-#endif // _KBDBIOS32_H_
+#endif /* _KBDBIOS32_H_ */
/* EOF */
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/moubios32.h [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -77,6 +77,6 @@
BOOLEAN MouseBios32Initialize(VOID);
VOID MouseBios32Cleanup(VOID);
-#endif // _MOUBIOS32_H_
+#endif /* _MOUBIOS32_H_ */
/* EOF */
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.c [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -16,7 +16,7 @@
#include "int32.h"
#include "vidbios32.h"
-#include "../vidbios.h"
+#include <bios/vidbios.h>
#include "bios32p.h"
/* PUBLIC FUNCTIONS
***********************************************************/
Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/ntvdm/bios/bios32/vidbios32.h [iso-8859-1]
Mon Nov 10 19:47:28 2014
@@ -24,6 +24,6 @@
BOOLEAN VidBios32Initialize(VOID);
VOID VidBios32Cleanup(VOID);
-#endif // _VIDBIOS32_H_
+#endif /* _VIDBIOS32_H_ */
/* EOF */
Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/vga.c?rev=65369&r1=65368&r2=65369&view=diff
==============================================================================
--- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Mon Nov 10
19:47:28 2014
@@ -12,7 +12,7 @@
#include "emulator.h"
#include "vga.h"
-#include "../bios/vidbios.h"
+#include <bios/vidbios.h>
#include "io.h"
