Replaced Cxbx.h with CxbxCommon.h

src/Common/CxbxDebugger.cpp

@@ -32,7 +32,7 @@
 // *
 // ******************************************************************
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "CxbxKrnl/EmuShared.h"
 #include "CxbxDebugger.h"
 

src/Common/EmuEEPROM.cpp

@@ -44,7 +44,7 @@ namespace xboxkrnl
 #include <stdio.h> // For printf
 #include <shlobj.h> // For HANDLE, CreateFile, CreateFileMapping, MapViewOfFile
 
-#include "Cxbx.h" // For DbgPrintf
+#include "CxbxCommon.h" // For DbgPrintf
 #include "EmuEEPROM.h" // For EEPROMInfo, EEPROMInfos
 #include "..\CxbxKrnl\Emu.h" // For EmuWarning
 #include "..\..\src\devices\LED.h" // For SetLEDSequence

src/Common/Error.h

@@ -34,7 +34,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 #include <string>
 

src/Common/Logging.h

@@ -40,7 +40,7 @@
 #include <sstream> // For std::stringstream
 #include <iostream> // For std::cout
 #include <iomanip> // For std::setw
-#include "Cxbx.h" // For g_bPrintfOn
+#include "CxbxCommon.h" // For g_bPrintfOn
 
 
 //

src/Common/Win32/XBAudio.h

@@ -34,7 +34,7 @@
 #ifndef XBAUDIO_H
 #define XBAUDIO_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Error.h"
 #include "Mutex.h"
 

src/Common/Win32/XBVideo.h

@@ -34,7 +34,7 @@
 #ifndef XBVIDEO_H
 #define XBVIDEO_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Error.h"
 #include "Mutex.h"
 

src/Cxbx/CxbxXbdm.cpp

@@ -42,7 +42,7 @@
 #include <cctype>
 #include <clocale>
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Logging.h"
 
 namespace xbdm {

src/CxbxKrnl/DbgConsole.h

@@ -34,7 +34,7 @@
 #ifndef DBGCONSOLE_H
 #define DBGCONSOLE_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // debug console input
 class DbgConsole

src/CxbxKrnl/EmuD3D8/PixelShader.h

@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // dump pixel shader definition to file
 void DumpPixelShaderDefToFile( X_D3DPIXELSHADERDEF* pPSDef, const char* pszCode );

src/CxbxKrnl/EmuD3D8/VertexBuffer.h

@@ -34,7 +34,7 @@
 #ifndef VERTEXBUFFER_H
 #define VERTEXBUFFER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 //#include <ctime> // Conflict with io.h
 
 #define MAX_NBR_STREAMS 16
@@ -126,4 +126,4 @@ extern VOID EmuUpdateActiveTexture();
 
 extern DWORD g_dwPrimPerFrame;
  
-#endif
+#endif

src/CxbxKrnl/EmuD3D8/VertexShader.h

@@ -34,7 +34,7 @@
 #ifndef VERTEXSHADER_H
 #define VERTEXSHADER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 // nv2a microcode header
 typedef struct

src/CxbxKrnl/EmuShared.h

@@ -34,7 +34,7 @@
 #ifndef EMUSHARED_H
 #define EMUSHARED_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Win32/XBController.h"
 #include "Common/Win32/XBVideo.h"
 #include "Common/Win32/XBAudio.h"

src/CxbxKrnl/EmuX86.h

@@ -34,7 +34,7 @@
 #ifndef EMUX86_H
 #define EMUX86_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include <cstdint>
 #include <windows.h>
 

src/CxbxKrnl/KernelThunk.cpp

@@ -41,7 +41,7 @@ namespace xboxkrnl
     #include <xboxkrnl/xboxkrnl.h>
 };
 
-#include "Cxbx.h" // For CxbxKrnl_KernelThunkTable
+#include "CxbxCommon.h" // For CxbxKrnl_KernelThunkTable
 #include "CxbxKrnl.h" // For UINT
 
 #define FUNC(f) f

src/CxbxKrnl/ResourceTracker.h

@@ -34,7 +34,7 @@
 #ifndef RESOURCETRACKER_H
 #define RESOURCETRACKER_H
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 #include "Common/Win32/Mutex.h"
 
 extern class ResourceTracker : public Mutex

src/devices/video/EmuNV2A_PTIMER.cpp

@@ -39,7 +39,7 @@
 // *
 // ******************************************************************
 
-#include "Cxbx.h"
+#include "CxbxCommon.h"
 
 /* PTIMER - time measurement and time-based alarms */
 static uint64_t ptimer_get_clock(NV2AState * d)

src/devices/video/nv2a.h

@@ -40,7 +40,7 @@
 #include "glib_compat.h" // For GHashTable, g_hash_table_new, g_hash_table_lookup, g_hash_table_insert
 #endif
 
-#include "Cxbx.h" // For xbaddr
+#include "CxbxCommon.h" // For xbaddr
 #include "devices\PCIDevice.h" // For PCIDevice
 
 #include <queue>