core renamed to common

Cxbe.dsp

@@ -102,15 +102,15 @@ SOURCE=.\Source\Cxbx.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Error.h
+SOURCE=.\Source\Common\Error.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Exe.h
+SOURCE=.\Source\Common\Exe.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Xbe.h
+SOURCE=.\Source\Common\Xbe.h
 # End Source File
 # End Group
 # Begin Group "Source"
@@ -118,11 +118,11 @@ SOURCE=.\Source\Core\Xbe.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\Source\Core\Error.cpp
+SOURCE=.\Source\Common\Error.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Exe.cpp
+SOURCE=.\Source\Common\Exe.cpp
 # End Source File
 # Begin Source File
 
@@ -130,11 +130,11 @@ SOURCE=.\Source\Standard\Cxbe\Main.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\OpenXDK.cpp
+SOURCE=.\Source\Common\OpenXDK.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Xbe.cpp
+SOURCE=.\Source\Common\Xbe.cpp
 # End Source File
 # End Group
 # End Target

Cxbx.dsp

@@ -182,7 +182,7 @@ SOURCE=.\Source\Win32\CxbxKrnl\EmuXTL.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Exe.h
+SOURCE=.\Source\Common\Exe.h
 # End Source File
 # Begin Source File
 
@@ -226,7 +226,7 @@ SOURCE=.\Source\Win32\XBController.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Xbe.h
+SOURCE=.\Source\Common\Xbe.h
 # End Source File
 # Begin Source File
 
@@ -282,11 +282,11 @@ SOURCE=.\Source\Win32\Cxbx\EmuExe.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Error.cpp
+SOURCE=.\Source\Common\Error.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Exe.cpp
+SOURCE=.\Source\Common\Exe.cpp
 # End Source File
 # Begin Source File
 
@@ -294,7 +294,7 @@ SOURCE=.\Source\Win32\Mutex.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\OpenXDK.cpp
+SOURCE=.\Source\Common\OpenXDK.cpp
 # End Source File
 # Begin Source File
 
@@ -322,7 +322,7 @@ SOURCE=.\Source\Win32\XBController.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Xbe.cpp
+SOURCE=.\Source\Common\Xbe.cpp
 # End Source File
 # Begin Source File
 

CxbxKrnl.dsp

@@ -327,7 +327,7 @@ SOURCE=.\Source\Win32\XBController.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Xbe.h
+SOURCE=.\Source\Common\Xbe.h
 # End Source File
 # Begin Source File
 
@@ -582,7 +582,7 @@ SOURCE=.\Source\Win32\CxbxKrnl\EmuXOnline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\Source\Core\Error.cpp
+SOURCE=.\Source\Common\Error.cpp
 # End Source File
 # Begin Source File
 

Makefile

@@ -39,10 +39,10 @@ OBJCOPY	= objcopy
 GCC295 = cpp0-2.95
 #LDFLAGS = -s -S -T ldscript.ld
 
-OBJECTS	= Source/Core/Error.o \
+OBJECTS	= Source/Common/Error.o \
-	Source/Core/Exe.o \
+	Source/Common/Exe.o \
-	Source/Core/Xbe.o \
+	Source/Common/Xbe.o \
-        Source/Core/OpenXDK.o \
+        Source/Common/OpenXDK.o \
 	Source/Standard/Cxbe/Main.o
 
 RESOURCES = 

Source/Common/Error.cpp

@@ -31,7 +31,8 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#include "Core/Error.h"
+
+#include "Common/Error.h"
 
 #include <string.h>
 

Source/Common/Exe.h

@@ -34,7 +34,7 @@
 #ifndef EXE_H
 #define EXE_H
 
-#include "Core/Error.h"
+#include "Common/Error.h"
 
 // Exe (PE) file object
 class Exe : public Error

Source/Common/Xbe.h

@@ -34,7 +34,7 @@
 #ifndef XBE_H
 #define XBE_H
 
-#include "Core/Error.h"
+#include "Common/Error.h"
 
 #include <stdio.h>
 

Source/Standard/Cxbe/Main.cpp

@@ -31,8 +31,9 @@
 // *  All rights reserved
 // *
 // ******************************************************************
-#include "../../Core/Exe.h"
+
-#include "../../Core/Xbe.h"
+#include "../../Common/Exe.h"
+#include "../../Common/Xbe.h"
 
 #include <string.h>
 

Source/Win32/Cxbx/EmuExe.h

@@ -34,7 +34,7 @@
 #ifndef EMUEXE_H
 #define EMUEXE_H
 
-#include "Core/Exe.h"
+#include "Common/Exe.h"
 #include <windows.h>
 
 // ******************************************************************

Source/Win32/Cxbx/Wnd.h

@@ -34,7 +34,7 @@
 #ifndef WND_H
 #define WND_H
 
-#include "Core/Error.h"
+#include "Common/Error.h"
 
 #include <windows.h>
 

Source/Win32/Cxbx/WndMain.h

@@ -35,8 +35,8 @@
 #define WNDMAIN_H
 
 #include "Wnd.h"
-#include "Core/Exe.h"
+#include "Common/Exe.h"
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 
 // ******************************************************************
 // * constants

Source/Win32/CxbxKrnl/CxbxKrnl.h

@@ -36,7 +36,7 @@
 
 #include "Cxbx.h"
 
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>

Source/Win32/CxbxKrnl/Emu.h

@@ -34,7 +34,7 @@
 #ifndef EMU_H
 #define EMU_H
 
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>

Source/Win32/CxbxKrnl/EmuD3D8.h

@@ -36,7 +36,7 @@
 
 #include "EmuD3D8Types.h"
 
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 #include "Emu.h"
 
 #define DIRECTDRAW_VERSION 0x0700

Source/Win32/CxbxKrnl/EmuDSound.h

@@ -34,7 +34,7 @@
 #ifndef EMUDSOUND_H
 #define EMUDSOUND_H
 
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>

Source/Win32/CxbxKrnl/EmuFS.h

@@ -34,7 +34,7 @@
 #ifndef EMUFS_H
 #define EMUFS_H
 
-#include "Core/Xbe.h"
+#include "Common/Xbe.h"
 
 // word @ FS:[0x14] := wSwapFS
 // byte @ FS:[0x16] := bIsXboxFS

Source/Win32/XBController.h

@@ -35,7 +35,7 @@
 #define XBCONTROLLER_H
 
 #include "Cxbx.h"
-#include "Core/Error.h"
+#include "Common/Error.h"
 #include "Mutex.h"
 
 #include <stdio.h>

Source/Win32/XBVideo.h

@@ -35,7 +35,7 @@
 #define XBVIDEO_H
 
 #include "Cxbx.h"
-#include "Core/Error.h"
+#include "Common/Error.h"
 #include "Mutex.h"
 
 // ******************************************************************