From c363f0d52cf95cca3533b4b33959fc7ce7bec075 Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Sun, 7 May 2006 23:26:44 +0000 Subject: [PATCH] core renamed to common --- Cxbe.dsp | 14 +++++++------- Cxbx.dsp | 12 ++++++------ CxbxKrnl.dsp | 4 ++-- Makefile | 8 ++++---- Source/{Core => Common}/Error.cpp | 3 ++- Source/{Core => Common}/Error.h | 0 Source/{Core => Common}/Exe.cpp | 0 Source/{Core => Common}/Exe.h | 2 +- Source/{Core => Common}/OpenXDK.cpp | 0 Source/{Core => Common}/Xbe.cpp | 0 Source/{Core => Common}/Xbe.h | 2 +- Source/Standard/Cxbe/Main.cpp | 5 +++-- Source/Win32/Cxbx/EmuExe.h | 2 +- Source/Win32/Cxbx/Wnd.h | 2 +- Source/Win32/Cxbx/WndMain.h | 4 ++-- Source/Win32/CxbxKrnl/CxbxKrnl.h | 2 +- Source/Win32/CxbxKrnl/Emu.h | 2 +- Source/Win32/CxbxKrnl/EmuD3D8.h | 2 +- Source/Win32/CxbxKrnl/EmuDSound.h | 2 +- Source/Win32/CxbxKrnl/EmuFS.h | 2 +- Source/Win32/XBController.h | 2 +- Source/Win32/XBVideo.h | 2 +- 22 files changed, 37 insertions(+), 35 deletions(-) rename Source/{Core => Common}/Error.cpp (98%) rename Source/{Core => Common}/Error.h (100%) rename Source/{Core => Common}/Exe.cpp (100%) rename Source/{Core => Common}/Exe.h (99%) rename Source/{Core => Common}/OpenXDK.cpp (100%) rename Source/{Core => Common}/Xbe.cpp (100%) rename Source/{Core => Common}/Xbe.h (99%) diff --git a/Cxbe.dsp b/Cxbe.dsp index 10f3d0001..4b2df3976 100644 --- a/Cxbe.dsp +++ b/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 diff --git a/Cxbx.dsp b/Cxbx.dsp index 8dce24234..f6bbe959e 100644 --- a/Cxbx.dsp +++ b/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 diff --git a/CxbxKrnl.dsp b/CxbxKrnl.dsp index c769085df..591e46fb3 100644 --- a/CxbxKrnl.dsp +++ b/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 diff --git a/Makefile b/Makefile index ea40e6909..9a3f6bff5 100644 --- a/Makefile +++ b/Makefile @@ -39,10 +39,10 @@ OBJCOPY = objcopy GCC295 = cpp0-2.95 #LDFLAGS = -s -S -T ldscript.ld -OBJECTS = Source/Core/Error.o \ - Source/Core/Exe.o \ - Source/Core/Xbe.o \ - Source/Core/OpenXDK.o \ +OBJECTS = Source/Common/Error.o \ + Source/Common/Exe.o \ + Source/Common/Xbe.o \ + Source/Common/OpenXDK.o \ Source/Standard/Cxbe/Main.o RESOURCES = diff --git a/Source/Core/Error.cpp b/Source/Common/Error.cpp similarity index 98% rename from Source/Core/Error.cpp rename to Source/Common/Error.cpp index bdc7fa538..e1e8f6261 100644 --- a/Source/Core/Error.cpp +++ b/Source/Common/Error.cpp @@ -31,7 +31,8 @@ // * All rights reserved // * // ****************************************************************** -#include "Core/Error.h" + +#include "Common/Error.h" #include diff --git a/Source/Core/Error.h b/Source/Common/Error.h similarity index 100% rename from Source/Core/Error.h rename to Source/Common/Error.h diff --git a/Source/Core/Exe.cpp b/Source/Common/Exe.cpp similarity index 100% rename from Source/Core/Exe.cpp rename to Source/Common/Exe.cpp diff --git a/Source/Core/Exe.h b/Source/Common/Exe.h similarity index 99% rename from Source/Core/Exe.h rename to Source/Common/Exe.h index 7af204acf..0f972aeb5 100644 --- a/Source/Core/Exe.h +++ b/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 diff --git a/Source/Core/OpenXDK.cpp b/Source/Common/OpenXDK.cpp similarity index 100% rename from Source/Core/OpenXDK.cpp rename to Source/Common/OpenXDK.cpp diff --git a/Source/Core/Xbe.cpp b/Source/Common/Xbe.cpp similarity index 100% rename from Source/Core/Xbe.cpp rename to Source/Common/Xbe.cpp diff --git a/Source/Core/Xbe.h b/Source/Common/Xbe.h similarity index 99% rename from Source/Core/Xbe.h rename to Source/Common/Xbe.h index 77a9239e6..fc9d1da64 100644 --- a/Source/Core/Xbe.h +++ b/Source/Common/Xbe.h @@ -34,7 +34,7 @@ #ifndef XBE_H #define XBE_H -#include "Core/Error.h" +#include "Common/Error.h" #include diff --git a/Source/Standard/Cxbe/Main.cpp b/Source/Standard/Cxbe/Main.cpp index 27b1e0539..122ef4768 100644 --- a/Source/Standard/Cxbe/Main.cpp +++ b/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 diff --git a/Source/Win32/Cxbx/EmuExe.h b/Source/Win32/Cxbx/EmuExe.h index 6a8904da3..5cb450583 100644 --- a/Source/Win32/Cxbx/EmuExe.h +++ b/Source/Win32/Cxbx/EmuExe.h @@ -34,7 +34,7 @@ #ifndef EMUEXE_H #define EMUEXE_H -#include "Core/Exe.h" +#include "Common/Exe.h" #include // ****************************************************************** diff --git a/Source/Win32/Cxbx/Wnd.h b/Source/Win32/Cxbx/Wnd.h index e17bb74d2..709f5a257 100644 --- a/Source/Win32/Cxbx/Wnd.h +++ b/Source/Win32/Cxbx/Wnd.h @@ -34,7 +34,7 @@ #ifndef WND_H #define WND_H -#include "Core/Error.h" +#include "Common/Error.h" #include diff --git a/Source/Win32/Cxbx/WndMain.h b/Source/Win32/Cxbx/WndMain.h index c13c30f9f..6a1aa3f0f 100644 --- a/Source/Win32/Cxbx/WndMain.h +++ b/Source/Win32/Cxbx/WndMain.h @@ -35,8 +35,8 @@ #define WNDMAIN_H #include "Wnd.h" -#include "Core/Exe.h" -#include "Core/Xbe.h" +#include "Common/Exe.h" +#include "Common/Xbe.h" // ****************************************************************** // * constants diff --git a/Source/Win32/CxbxKrnl/CxbxKrnl.h b/Source/Win32/CxbxKrnl/CxbxKrnl.h index 6568ac707..5cabbda0c 100644 --- a/Source/Win32/CxbxKrnl/CxbxKrnl.h +++ b/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 diff --git a/Source/Win32/CxbxKrnl/Emu.h b/Source/Win32/CxbxKrnl/Emu.h index 9ea93c17d..ec151a59d 100644 --- a/Source/Win32/CxbxKrnl/Emu.h +++ b/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 diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.h b/Source/Win32/CxbxKrnl/EmuD3D8.h index a56abf8ca..b1998192e 100644 --- a/Source/Win32/CxbxKrnl/EmuD3D8.h +++ b/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 diff --git a/Source/Win32/CxbxKrnl/EmuDSound.h b/Source/Win32/CxbxKrnl/EmuDSound.h index 8d38be3d6..704d30304 100644 --- a/Source/Win32/CxbxKrnl/EmuDSound.h +++ b/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 diff --git a/Source/Win32/CxbxKrnl/EmuFS.h b/Source/Win32/CxbxKrnl/EmuFS.h index c7729f10f..309a2eea0 100644 --- a/Source/Win32/CxbxKrnl/EmuFS.h +++ b/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 diff --git a/Source/Win32/XBController.h b/Source/Win32/XBController.h index e4314c136..9ad2c1648 100644 --- a/Source/Win32/XBController.h +++ b/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 diff --git a/Source/Win32/XBVideo.h b/Source/Win32/XBVideo.h index 70fdd8363..162c2c525 100644 --- a/Source/Win32/XBVideo.h +++ b/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" // ******************************************************************