From 3d46f3517490bdcbbe1da4baaa21f80169c1ce13 Mon Sep 17 00:00:00 2001
From: ergo720 <45463469+ergo720@users.noreply.github.com>
Date: Sat, 15 Dec 2018 14:59:34 +0100
Subject: [PATCH] Created xbe folder

---
 build/win32/Cxbx.vcxproj                | 8 ++++----
 build/win32/Cxbx.vcxproj.filters        | 8 ++++----
 src/Cxbx/WndMain.cpp                    | 2 +-
 src/Cxbx/WndMain.h                      | 2 +-
 src/CxbxKrnl/CxbxKrnl.h                 | 2 +-
 src/CxbxKrnl/Emu.h                      | 2 +-
 src/CxbxKrnl/EmuFS.h                    | 4 ++--
 src/common/XADPCM.h                     | 2 +-
 src/common/{ => xbe}/Xbe.cpp            | 2 +-
 src/common/{ => xbe}/Xbe.h              | 0
 src/common/{ => xbe}/XbePrinter.cpp     | 2 +-
 src/common/{ => xbe}/XbePrinter.h       | 2 +-
 src/core/HLE/D3D8/Direct3D9/Direct3D9.h | 2 +-
 src/core/HLE/XACTENG/XactEng.h          | 2 +-
 src/devices/Xbox.cpp                    | 2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)
 rename src/common/{ => xbe}/Xbe.cpp (96%)
 rename src/common/{ => xbe}/Xbe.h (100%)
 rename src/common/{ => xbe}/XbePrinter.cpp (99%)
 rename src/common/{ => xbe}/XbePrinter.h (99%)

diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index 3865484ae..57286e8ed 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -207,7 +207,7 @@
     <ClInclude Include="..\..\src\Common\CxbxDebugger.h" />
     <ClInclude Include="..\..\src\Common\Win32\XBPortMapping.h" />
     <ClInclude Include="..\..\src\Common\XADPCM.h" />
-    <ClInclude Include="..\..\src\Common\XbePrinter.h" />
+    <ClInclude Include="..\..\src\common\xbe\XbePrinter.h" />
     <ClInclude Include="..\..\src\CxbxKrnl\crc32c.h" />
     <ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h" />
     <ClInclude Include="..\..\src\Common\EmuEEPROM.h" />
@@ -273,7 +273,7 @@
     <ClInclude Include="..\..\src\Cxbx\Wnd.h" />
     <ClInclude Include="..\..\src\Cxbx\WndMain.h" />
     <ClInclude Include="..\..\src\Common\Win32\DInputController.h" />
-    <ClInclude Include="..\..\src\Common\Xbe.h" />
+    <ClInclude Include="..\..\src\common\xbe\Xbe.h" />
     <ClInclude Include="..\..\src\devices\ADM1032Device.h" />
     <ClInclude Include="..\..\src\devices\EEPROMDevice.h" />
     <ClInclude Include="..\..\src\devices\EmuNVNet.h" />
@@ -351,7 +351,7 @@
     <ClCompile Include="..\..\src\Common\Win32\Threads.cpp" />
     <ClCompile Include="..\..\src\Common\CxbxDebugger.cpp" />
     <ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp" />
-    <ClCompile Include="..\..\src\Common\XbePrinter.cpp" />
+    <ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp" />
     <ClCompile Include="..\..\src\CxbxKrnl\crc32c.cpp" />
     <ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp" />
     <ClCompile Include="..\..\src\Common\EmuEEPROM.cpp" />
@@ -518,7 +518,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\src\Common\Xbe.cpp">
+    <ClCompile Include="..\..\src\common\xbe\Xbe.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index 1578332d9..9fa6e241c 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -94,7 +94,7 @@
     <ClCompile Include="..\..\src\Common\Win32\Mutex.cpp">
       <Filter>Shared</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Common\Xbe.cpp">
+    <ClCompile Include="..\..\src\common\xbe\Xbe.cpp">
       <Filter>Shared</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\CxbxKrnl\CxbxKrnl.cpp">
@@ -208,7 +208,7 @@
     <ClCompile Include="..\..\src\devices\Xbox.cpp">
       <Filter>Hardware</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Common\XbePrinter.cpp">
+    <ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp">
       <Filter>Shared</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\Common\Win32\Threads.cpp">
@@ -371,7 +371,7 @@
     <ClInclude Include="..\..\src\Cxbx\ResCxbx.h">
       <Filter>Shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Common\Xbe.h">
+    <ClInclude Include="..\..\src\common\xbe\Xbe.h">
       <Filter>Shared</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h">
@@ -503,7 +503,7 @@
     <ClInclude Include="..\..\src\Common\CxbxDebugger.h">
       <Filter>Shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Common\XbePrinter.h">
+    <ClInclude Include="..\..\src\common\xbe\XbePrinter.h">
       <Filter>Shared</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\Common\Win32\Threads.h">
diff --git a/src/Cxbx/WndMain.cpp b/src/Cxbx/WndMain.cpp
index 65f389015..389cf8fb6 100644
--- a/src/Cxbx/WndMain.cpp
+++ b/src/Cxbx/WndMain.cpp
@@ -47,7 +47,7 @@
 #include "DlgEepromConfig.h"
 #include "DlgLoggingConfig.h"
 #include "DlgXboxControllerPortMapping.h"
-#include "Common/XbePrinter.h" // For DumpInformation
+#include "common\xbe\XbePrinter.h" // For DumpInformation
 #include "CxbxKrnl/EmuShared.h"
 #include "CxbxKrnl/EmuXTL.h"
 #include "Common/Settings.hpp"
diff --git a/src/Cxbx/WndMain.h b/src/Cxbx/WndMain.h
index 16b6715e9..b80d80100 100644
--- a/src/Cxbx/WndMain.h
+++ b/src/Cxbx/WndMain.h
@@ -35,7 +35,7 @@
 #define WNDMAIN_H
 
 #include "Wnd.h"
-#include "Common/Xbe.h"
+#include "common\xbe\/Xbe.h"
 
 #include <thread>
 
diff --git a/src/CxbxKrnl/CxbxKrnl.h b/src/CxbxKrnl/CxbxKrnl.h
index 9bd4c5031..4c98657ff 100644
--- a/src/CxbxKrnl/CxbxKrnl.h
+++ b/src/CxbxKrnl/CxbxKrnl.h
@@ -35,7 +35,7 @@
 #define CXBXKRNL_H
 
 #include "Cxbx.h"
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 #include "Logging.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
diff --git a/src/CxbxKrnl/Emu.h b/src/CxbxKrnl/Emu.h
index 851657313..2955bd766 100644
--- a/src/CxbxKrnl/Emu.h
+++ b/src/CxbxKrnl/Emu.h
@@ -34,7 +34,7 @@
 #ifndef EMU_H
 #define EMU_H
 
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 #include "Logging.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
diff --git a/src/CxbxKrnl/EmuFS.h b/src/CxbxKrnl/EmuFS.h
index d6dc17659..867f7aab7 100644
--- a/src/CxbxKrnl/EmuFS.h
+++ b/src/CxbxKrnl/EmuFS.h
@@ -35,7 +35,7 @@
 #define EMUFS_H
 
 #include <vector>
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
 
@@ -51,4 +51,4 @@ typedef struct
 	void* functionPtr;
 }fs_instruction_t;
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/common/XADPCM.h b/src/common/XADPCM.h
index b116ac031..77d435169 100644
--- a/src/common/XADPCM.h
+++ b/src/common/XADPCM.h
@@ -34,7 +34,7 @@
 #ifndef XBOXADPCM_H
 #define XBOXADPCM_H
 
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 
 /*
   TXboxAdpcmDecoder  0.1.3
diff --git a/src/common/Xbe.cpp b/src/common/xbe/Xbe.cpp
similarity index 96%
rename from src/common/Xbe.cpp
rename to src/common/xbe/Xbe.cpp
index daedca42d..40fc75069 100644
--- a/src/common/Xbe.cpp
+++ b/src/common/xbe/Xbe.cpp
@@ -41,7 +41,7 @@ namespace xboxkrnl
 	#include <xboxkrnl/xboxkrnl.h>
 };
 
-#include "Xbe.h"
+#include "common\xbe\Xbe.h"
 #include "CxbxUtil.h" // For RoundUp
 #include <experimental/filesystem> // filesystem related functions available on C++ 17
 #include <locale> // For ctime
diff --git a/src/common/Xbe.h b/src/common/xbe/Xbe.h
similarity index 100%
rename from src/common/Xbe.h
rename to src/common/xbe/Xbe.h
diff --git a/src/common/XbePrinter.cpp b/src/common/xbe/XbePrinter.cpp
similarity index 99%
rename from src/common/XbePrinter.cpp
rename to src/common/xbe/XbePrinter.cpp
index f5d77f2fb..c601f3a9d 100644
--- a/src/common/XbePrinter.cpp
+++ b/src/common/xbe/XbePrinter.cpp
@@ -34,7 +34,7 @@
 // *
 // ******************************************************************
 
-#include "XbePrinter.h"
+#include "common\xbe\XbePrinter.h"
 #include "CxbxVersion.h" // For _CXBX_VERSION
 
 #include <locale> // For ctime
diff --git a/src/common/XbePrinter.h b/src/common/xbe/XbePrinter.h
similarity index 99%
rename from src/common/XbePrinter.h
rename to src/common/xbe/XbePrinter.h
index dcd25b55a..96d8ff072 100644
--- a/src/common/XbePrinter.h
+++ b/src/common/xbe/XbePrinter.h
@@ -35,7 +35,7 @@
 #define XBE_PRINTER_H
 
 #include "Common/Error.h"
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 
 #include <cstdio>
 
diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h
index 94f114888..c9d1a2afb 100644
--- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.h
+++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.h
@@ -36,7 +36,7 @@
 
 #include "../XbD3D8Types.h"
 #include "CxbxKrnl/CxbxKrnl.h"
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 #include "CxbxKrnl/Emu.h"
 
 #define DIRECTDRAW_VERSION 0x0700
diff --git a/src/core/HLE/XACTENG/XactEng.h b/src/core/HLE/XACTENG/XactEng.h
index fb2f25151..845c4fc11 100644
--- a/src/core/HLE/XACTENG/XactEng.h
+++ b/src/core/HLE/XACTENG/XactEng.h
@@ -34,7 +34,7 @@
 #ifndef EMUXACTENG_H
 #define EMUXACTENG_H
 
-#include "Common/Xbe.h"
+#include "common\xbe\Xbe.h"
 
 #undef FIELD_OFFSET     // prevent macro redefinition warnings
 #include <windows.h>
diff --git a/src/devices/Xbox.cpp b/src/devices/Xbox.cpp
index 61480ee36..ebb3a67d8 100644
--- a/src/devices/Xbox.cpp
+++ b/src/devices/Xbox.cpp
@@ -35,7 +35,7 @@
 // ******************************************************************
 
 #include "Xbox.h" // For HardwareModel
-#include "Xbe.h"  // Without this HLEIntercept complains about some undefined xbe variables
+#include "common\xbe\Xbe.h"  // Without this HLEIntercept complains about some undefined xbe variables
 #include "core/HLE/Intercept.hpp"
 
 PCIBus* g_PCIBus;