ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved ResourceTracker.h + renamed HLE -> hle

This commit is contained in:
ergo720 2018-12-15 19:26:47 +01:00
parent ef70b6a33d
commit 813975a6c2
66 changed files with 145 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
build/win32/Cxbx.vcxproj
View File

@ -219,17 +219,17 @@
<ClInclude Include="..\..\src\Cxbx.h" />
<ClInclude Include="..\..\src\core\kernel\init\CxbxKrnl.h" />
<ClInclude Include="..\..\src\gui\DbgConsole.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h" />
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp" />
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp" />
<ClInclude Include="..\..\src\core\hle\D3D8\Direct3D9\Direct3D9.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbD3D8Types.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbConvert.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbPixelShader.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbPushBuffer.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbState.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbVertexBuffer.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\XbVertexShader.h" />
<ClInclude Include="..\..\src\core\hle\XAPI\OHCI\XInput\DInput.h" />
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSound.hpp" />
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundInline.hpp" />
<ClInclude Include="..\..\src\core\kernel\support\EmuFile.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuFS.h" />
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlAvModes.h" />
@ -239,21 +239,21 @@
<ClInclude Include="..\..\src\common\crypto\EmuRsa.h" />
<ClInclude Include="..\..\src\common\crypto\EmuSha.h" />
<ClInclude Include="..\..\src\devices\x86\EmuX86.h" />
<ClInclude Include="..\..\src\core\HLE\XACTENG\XactEng.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h" />
<ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h" />
<ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h" />
<ClInclude Include="..\..\src\core\hle\XACTENG\XactEng.h" />
<ClInclude Include="..\..\src\core\hle\XAPI\Xapi.h" />
<ClInclude Include="..\..\src\core\hle\XGRAPHIC\XGraphic.h" />
<ClInclude Include="..\..\src\core\hle\XAPI\OHCI\XInput\XInput.h" />
<ClInclude Include="..\..\src\core\hle\XONLINE\XOnline.h" />
<ClInclude Include="..\..\src\core\kernel\support\EmuXTL.h" />
<ClInclude Include="..\..\src\common\util\gloffscreen\glextensions.h" />
<ClInclude Include="..\..\src\common\util\gloffscreen\gloffscreen.h" />
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp" />
<ClInclude Include="..\..\src\core\HLE\Patches.hpp" />
<ClInclude Include="..\..\src\core\hle\Intercept.hpp" />
<ClInclude Include="..\..\src\core\hle\Patches.hpp" />
<ClInclude Include="..\..\src\common\crypto\LibRc4.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PoolManager.h" />
<ClInclude Include="..\..\src\common\ReservedMemory.h" />
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h" />
<ClInclude Include="..\..\src\core\hle\D3D8\ResourceTracker.h" />
<ClInclude Include="..\..\src\devices\usb\Timer.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\VMManager.h" />
<ClInclude Include="..\..\src\CxbxVersion.h" />
@ -353,7 +353,7 @@
<ClCompile Include="..\..\src\common\win32\XBPortMapping.cpp" />
<ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp" />
<ClCompile Include="..\..\src\common\util\crc32c.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbD3D8Logging.cpp" />
<ClCompile Include="..\..\src\common\EmuEEPROM.cpp" />
<ClCompile Include="..\..\src\common\Logging.cpp" />
<ClCompile Include="..\..\src\common\win32\EmuShared.cpp">
@ -383,15 +383,15 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp" />
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\Direct3D9\Direct3D9.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbConvert.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbPixelShader.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbPushBuffer.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbState.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbVertexBuffer.cpp" />
<ClCompile Include="..\..\src\core\hle\D3D8\XbVertexShader.cpp" />
<ClCompile Include="..\..\src\core\hle\XAPI\OHCI\XInput\DInput.cpp" />
<ClCompile Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSound.cpp" />
<ClCompile Include="..\..\src\core\kernel\support\EmuFile.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -437,16 +437,16 @@
<ClCompile Include="..\..\src\common\crypto\EmuRsa.cpp" />
<ClCompile Include="..\..\src\common\crypto\EmuSha.cpp" />
<ClCompile Include="..\..\src\devices\x86\EmuX86.cpp" />
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp" />
<ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp" />
<ClCompile Include="..\..\src\core\HLE\XONLINE\XOnline.cpp" />
<ClCompile Include="..\..\src\core\hle\XACTENG\XactEng.cpp" />
<ClCompile Include="..\..\src\core\hle\XAPI\Xapi.cpp" />
<ClCompile Include="..\..\src\core\hle\XGRAPHIC\XGraphic.cpp" />
<ClCompile Include="..\..\src\core\hle\XAPI\OHCI\XInput\XInput.cpp" />
<ClCompile Include="..\..\src\core\hle\XONLINE\XOnline.cpp" />
<ClCompile Include="..\..\src\common\util\gloffscreen\glextensions.cpp" />
<ClCompile Include="..\..\src\common\util\gloffscreen\gloffscreen_common.cpp" />
<ClCompile Include="..\..\src\common\util\gloffscreen\gloffscreen_wgl.cpp" />
<ClCompile Include="..\..\src\core\HLE\Intercept.cpp" />
<ClCompile Include="..\..\src\core\HLE\Patches.cpp" />
<ClCompile Include="..\..\src\core\hle\Intercept.cpp" />
<ClCompile Include="..\..\src\core\hle\Patches.cpp" />
<ClCompile Include="..\..\src\core\kernel\exports\KernelThunk.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -456,7 +456,7 @@
<ClCompile Include="..\..\src\common\crypto\LibRc4.cpp" />
<ClCompile Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.cpp" />
<ClCompile Include="..\..\src\core\kernel\memory-manager\PoolManager.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\ResourceTracker.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\ResourceTracker.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

76
build/win32/Cxbx.vcxproj.filters
View File

@ -16,22 +16,22 @@
<ClCompile Include="..\..\src\gui\WndMain.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbConvert.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbPixelShader.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbPushBuffer.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbState.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbVertexBuffer.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbVertexShader.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\kernel\exports\EmuKrnl.cpp">
@ -106,13 +106,13 @@
<ClCompile Include="..\..\src\core\kernel\support\Emu.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\Direct3D9\Direct3D9.cpp">
<Filter>core\HLE\D3D8\Direct3D9</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp">
<ClCompile Include="..\..\src\core\hle\XAPI\OHCI\XInput\DInput.cpp">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp">
<ClCompile Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSound.cpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\kernel\support\EmuFile.cpp">
@ -130,22 +130,22 @@
<ClCompile Include="..\..\src\common\win32\EmuShared.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp">
<ClCompile Include="..\..\src\core\hle\XACTENG\XactEng.cpp">
<Filter>core\HLE\XACTENG</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp">
<ClCompile Include="..\..\src\core\hle\XAPI\Xapi.cpp">
<Filter>core\HLE\XAPI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp">
<ClCompile Include="..\..\src\core\hle\XGRAPHIC\XGraphic.cpp">
<Filter>core\HLE\XGRAPHIC</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp">
<ClCompile Include="..\..\src\core\hle\XAPI\OHCI\XInput\XInput.cpp">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XONLINE\XOnline.cpp">
<ClCompile Include="..\..\src\core\hle\XONLINE\XOnline.cpp">
<Filter>core\HLE\XONLINE</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\Intercept.cpp">
<ClCompile Include="..\..\src\core\hle\Intercept.cpp">
<Filter>core\HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\kernel\exports\KernelThunk.cpp">
@ -157,7 +157,7 @@
<ClCompile Include="..\..\src\common\Logging.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\ResourceTracker.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\ResourceTracker.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\xdvdfs-tools\xdvdfs.cpp">
@ -172,7 +172,7 @@
<ClCompile Include="..\..\src\gui\DlgAbout.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp">
<ClCompile Include="..\..\src\core\hle\D3D8\XbD3D8Logging.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\DlgAudioConfig.cpp">
@ -332,22 +332,22 @@
<ClInclude Include="..\..\src\gui\Wnd.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbConvert.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbPixelShader.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbPushBuffer.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbState.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbVertexBuffer.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbVertexShader.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\kernel\exports\EmuKrnlLogging.h">
@ -380,16 +380,16 @@
<ClInclude Include="..\..\src\gui\DbgConsole.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h">
<ClInclude Include="..\..\src\core\hle\D3D8\Direct3D9\Direct3D9.h">
<Filter>core\HLE\D3D8\Direct3D9</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbD3D8Types.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h">
<ClInclude Include="..\..\src\core\hle\XAPI\OHCI\XInput\DInput.h">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp">
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSound.hpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\kernel\support\EmuFile.h">
@ -404,25 +404,25 @@
<ClInclude Include="..\..\src\common\crypto\EmuSha.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XACTENG\XactEng.h">
<ClInclude Include="..\..\src\core\hle\XACTENG\XactEng.h">
<Filter>core\HLE\XACTENG</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h">
<ClInclude Include="..\..\src\core\hle\XAPI\Xapi.h">
<Filter>core\HLE\XAPI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h">
<ClInclude Include="..\..\src\core\hle\XGRAPHIC\XGraphic.h">
<Filter>core\HLE\XGRAPHIC</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h">
<ClInclude Include="..\..\src\core\hle\XAPI\OHCI\XInput\XInput.h">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h">
<ClInclude Include="..\..\src\core\hle\XONLINE\XOnline.h">
<Filter>core\HLE\XONLINE</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\kernel\support\EmuXTL.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp">
<ClInclude Include="..\..\src\core\hle\Intercept.hpp">
<Filter>core\HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\crypto\LibRc4.h">
@ -431,7 +431,7 @@
<ClInclude Include="..\..\src\common\Logging.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h">
<ClInclude Include="..\..\src\core\hle\D3D8\ResourceTracker.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\ReservedMemory.h">
@ -458,13 +458,13 @@
<ClInclude Include="..\..\src\gui\DlgAbout.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h">
<ClInclude Include="..\..\src\core\hle\D3D8\XbD3D8Logging.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\XADPCM.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp">
<ClInclude Include="..\..\src\core\hle\DSOUND\DirectSound\DirectSoundInline.hpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\DlgAudioConfig.h">
@ -626,10 +626,10 @@
<ClInclude Include="..\..\src\common\IPCHybrid.hpp">
<Filter>Cross Platform</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\Patches.hpp">
<ClInclude Include="..\..\src\core\hle\Patches.hpp">
<Filter>core\HLE</Filter>
</ClInclude>
<ClCompile Include="..\..\src\core\HLE\Patches.cpp">
<ClCompile Include="..\..\src\core\hle\Patches.cpp">
<Filter>core\HLE</Filter>
</ClCompile>
</ItemGroup>

2
src/common/Error.cpp
View File

@ -34,7 +34,7 @@
// *
// ******************************************************************
#include "Common/Error.h"
#include "common\Error.h"
const std::string& Error::GetError()
{

2
src/common/Logging.cpp
View File

@ -37,7 +37,7 @@
#include <windows.h> // for PULONG
#include "Logging.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include "EmuShared.h"
// For thread_local, see : http://en.cppreference.com/w/cpp/language/storage_duration

4
src/common/win32/DInputController.h
View File

@ -35,7 +35,7 @@
#define DINPUTCONTROLLER_H
#include "Cxbx.h"
#include "Common/Error.h"
#include "common\Error.h"
#include "Mutex.h"
#include <cstdio>
@ -43,7 +43,7 @@
#include <windows.h>
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
/*
// ******************************************************************
// * Xbox Controller Object IDs

4
src/common/win32/EmuShared.h
View File

@ -35,9 +35,9 @@
#define EMUSHARED_H
#include "Cxbx.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include "Mutex.h"
#include "Common/IPCHybrid.hpp"
#include "common\IPCHybrid.hpp"
#include <memory.h>

6
src/common/win32/IPCWindows.cpp
View File

@ -40,11 +40,11 @@
#include "Cxbx.h"
#include "core\kernel\init\CxbxKrnl.h"
#include "gui/ResCxbx.h"
#include "gui\ResCxbx.h"
#include "Common/IPCHybrid.hpp"
#include "common\IPCHybrid.hpp"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include "Logging.h"

2
src/common/win32/XBPortMapping.cpp
View File

@ -45,7 +45,7 @@ namespace xboxkrnl
#include <Shlwapi.h>
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include "Logging.h"
static Settings::s_controller_port g_ControllerPortMap;

2
src/common/xbe/Xbe.h
View File

@ -34,7 +34,7 @@
#ifndef XBE_H
#define XBE_H
#include "Common/Error.h"
#include "common\Error.h"
#include <cstdio>

2
src/common/xbe/XbePrinter.h
View File

@ -34,7 +34,7 @@
#ifndef XBE_PRINTER_H
#define XBE_PRINTER_H
#include "Common/Error.h"
#include "common\Error.h"
#include "common\xbe\Xbe.h"
#include <cstdio>

14
src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp → src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -42,7 +42,7 @@
// prevent name collisions
namespace xboxkrnl
{
#include <xboxkrnl/xboxkrnl.h>
#include <xboxkrnl\xboxkrnl.h>
};
#include "common\util\CxbxUtil.h"
@ -51,15 +51,15 @@ namespace xboxkrnl
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"
#include "gui/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "gui\DbgConsole.h"
#include "core\hle\D3D8\ResourceTracker.h"
#include "core\kernel\memory-manager\VMManager.h" // for g_VMManager
#include "core\kernel\support\EmuXTL.h"
#include "Logging.h"
#include "../XbD3D8Logging.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
#include "devices/video/nv2a.h" // For GET_MASK, NV_PGRAPH_CONTROL_0
#include "gui/ResCxbx.h"
#include "..\XbD3D8Logging.h"
#include "core\hle\Intercept.hpp" // for bLLE_GPU
#include "devices\video\nv2a.h" // For GET_MASK, NV_PGRAPH_CONTROL_0
#include "gui\ResCxbx.h"
#include <assert.h>
#include <process.h>

0
src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp.unused-patches → src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches
View File

0
src/core/HLE/D3D8/Direct3D9/Direct3D9.h → src/core/hle/D3D8/Direct3D9/Direct3D9.h
View File

2
src/CxbxKrnl/ResourceTracker.cpp → src/core/hle/D3D8/ResourceTracker.cpp
View File

@ -33,7 +33,7 @@
// * All rights reserved
// *
// ******************************************************************
#include "ResourceTracker.h"
#include "core\hle\D3D8\ResourceTracker.h"
//
// all of our resource trackers

2
src/CxbxKrnl/ResourceTracker.h → src/core/hle/D3D8/ResourceTracker.h
View File

@ -35,7 +35,7 @@
#define RESOURCETRACKER_H
#include "Cxbx.h"
#include "Common/Win32/Mutex.h"
#include "common\Win32\Mutex.h"
extern class ResourceTracker : public Mutex
{

0
src/core/HLE/D3D8/XbConvert.cpp → src/core/hle/D3D8/XbConvert.cpp
View File

0
src/core/HLE/D3D8/XbConvert.h → src/core/hle/D3D8/XbConvert.h
View File

0
src/core/HLE/D3D8/XbD3D8Logging.cpp → src/core/hle/D3D8/XbD3D8Logging.cpp
View File

0
src/core/HLE/D3D8/XbD3D8Logging.h → src/core/hle/D3D8/XbD3D8Logging.h
View File

0
src/core/HLE/D3D8/XbD3D8Types.h → src/core/hle/D3D8/XbD3D8Types.h
View File

0
src/core/HLE/D3D8/XbPixelShader.cpp → src/core/hle/D3D8/XbPixelShader.cpp
View File

0
src/core/HLE/D3D8/XbPixelShader.h → src/core/hle/D3D8/XbPixelShader.h
View File

2
src/core/HLE/D3D8/XbPushBuffer.cpp → src/core/hle/D3D8/XbPushBuffer.cpp
View File

@ -42,7 +42,7 @@
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "XbD3D8Types.h" // For X_D3DFORMAT
#include "CxbxKrnl/ResourceTracker.h"
#include "core\hle\D3D8\ResourceTracker.h"
#include "devices/video/nv2a.h" // For g_NV2A, PGRAPHState
#include "devices/video/nv2a_int.h" // For NV** defines
#include "Logging.h"

0
src/core/HLE/D3D8/XbPushBuffer.h → src/core/hle/D3D8/XbPushBuffer.h
View File

2
src/core/HLE/D3D8/XbState.cpp → src/core/hle/D3D8/XbState.cpp
View File

@ -45,7 +45,7 @@ DWORD *XTL::EmuD3DDeferredTextureState = nullptr;
extern uint32 g_BuildVersion;
#include "core\HLE\Intercept.hpp" // For g_SymbolAddresses
#include "core\hle\Intercept.hpp" // For g_SymbolAddresses
// ******************************************************************
// * patch: UpdateDeferredStates

0
src/core/HLE/D3D8/XbState.h → src/core/hle/D3D8/XbState.h
View File

2
src/core/HLE/D3D8/XbVertexBuffer.cpp → src/core/hle/D3D8/XbVertexBuffer.cpp
View File

@ -41,7 +41,7 @@
#include "common\util\xxhash32.h" // For XXHash32::hash()
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "core\hle\D3D8\ResourceTracker.h"
#include <ctime>
#include <unordered_map>

0
src/core/HLE/D3D8/XbVertexBuffer.h → src/core/hle/D3D8/XbVertexBuffer.h
View File

0
src/core/HLE/D3D8/XbVertexShader.cpp → src/core/hle/D3D8/XbVertexShader.cpp
View File

0
src/core/HLE/D3D8/XbVertexShader.h → src/core/hle/D3D8/XbVertexShader.h
View File

2
src/core/HLE/DSOUND/DirectSound/DirectSound.cpp → src/core/hle/DSOUND/DirectSound/DirectSound.cpp
View File

@ -50,7 +50,7 @@ namespace xboxkrnl {
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#ifndef _DEBUG_TRACE

0
src/core/HLE/DSOUND/DirectSound/DirectSound.hpp → src/core/hle/DSOUND/DirectSound/DirectSound.hpp
View File

0
src/core/HLE/DSOUND/DirectSound/DirectSoundInline.hpp → src/core/hle/DSOUND/DirectSound/DirectSoundInline.hpp
View File

4
src/core/HLE/Intercept.cpp → src/core/hle/Intercept.cpp
View File

@ -48,10 +48,10 @@
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "Common/CxbxDebugger.h"
#include "common\CxbxDebugger.h"
#include "Logging.h"
#pragma comment(lib, "XbSymbolDatabase.lib")
#include "../../import/XbSymbolDatabase/XbSymbolDatabase.h"
#include "..\..\import\XbSymbolDatabase\XbSymbolDatabase.h"
#include "Intercept.hpp"
#include "Patches.hpp"
#include "common\util\xxhash32.h"

0
src/core/HLE/Intercept.hpp → src/core/hle/Intercept.hpp
View File

0
src/core/HLE/Patches.cpp → src/core/hle/Patches.cpp
View File

0
src/core/HLE/Patches.hpp → src/core/hle/Patches.hpp
View File

2
src/core/HLE/XACTENG/XactEng.cpp → src/core/hle/XACTENG/XactEng.cpp
View File

@ -44,7 +44,7 @@ namespace xboxkrnl
};
#include "core\kernel\init\/CxbxKrnl.h"
#include "Common/Logging.h"
#include "common\Logging.h"
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "EmuShared.h"

0
src/core/HLE/XACTENG/XactEng.h → src/core/hle/XACTENG/XactEng.h
View File

2
src/core/HLE/XAPI/OHCI/XInput/DInput.cpp → src/core/hle/XAPI/OHCI/XInput/DInput.cpp
View File

@ -40,7 +40,7 @@
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "Common/Win32/DInputController.h"
#include "common\Win32\DInputController.h"
#include "Logging.h"
// ******************************************************************

0
src/core/HLE/XAPI/OHCI/XInput/DInput.h → src/core/hle/XAPI/OHCI/XInput/DInput.h
View File

0
src/core/HLE/XAPI/OHCI/XInput/XInput.cpp → src/core/hle/XAPI/OHCI/XInput/XInput.cpp
View File

0
src/core/HLE/XAPI/OHCI/XInput/XInput.h → src/core/hle/XAPI/OHCI/XInput/XInput.h
View File

8
src/core/HLE/XAPI/Xapi.cpp → src/core/hle/XAPI/Xapi.cpp
View File

@ -41,7 +41,7 @@
/* prevent name collisions */
namespace xboxkrnl
{
#include <xboxkrnl/xboxkrnl.h>
#include <xboxkrnl\xboxkrnl.h>
};
#include <Shlwapi.h>
@ -53,9 +53,9 @@ namespace xboxkrnl
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"
#include "EmuShared.h"
#include "../Common/Win32/XBPortMapping.h"
#include "core/HLE/Intercept.hpp"
#include "vsbc/CxbxVSBC.h"
#include "..\common/win32\XBPortMapping.h"
#include "core\hle\Intercept.hpp"
#include "vsbc\CxbxVSBC.h"
#include "Windef.h"
#include <vector>

0
src/core/HLE/XAPI/Xapi.h → src/core/hle/XAPI/Xapi.h
View File

4
src/core/HLE/XGRAPHIC/XGraphic.cpp → src/core/hle/XGRAPHIC/XGraphic.cpp
View File

@ -42,9 +42,9 @@
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "Common/Logging.h"
#include "common\Logging.h"
#include "core\kernel\support\EmuXTL.h"
#include "core/HLE/D3D8/XbD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
#include "core\hle\D3D8\XbD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
// ******************************************************************
// * patch: XGIsSwizzledFormat

0
src/core/HLE/XGRAPHIC/XGraphic.h → src/core/hle/XGRAPHIC/XGraphic.h
View File

2
src/core/HLE/XONLINE/XOnline.cpp → src/core/hle/XONLINE/XOnline.cpp
View File

@ -38,7 +38,7 @@
#define LOG_PREFIX CXBXR_MODULE::XONLINE
#include "core\kernel\support\Emu.h"
#include "Common/Logging.h"
#include "common\Logging.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\support\EmuXTL.h"

0
src/core/HLE/XONLINE/XOnline.h → src/core/hle/XONLINE/XOnline.h
View File

2
src/core/kernel/exports/EmuKrnlHal.cpp
View File

@ -54,7 +54,7 @@ namespace xboxkrnl
#include "devices\x86\EmuX86.h" // HalReadWritePciSpace needs this
#include "EmuShared.h"
#include "core\kernel\support\EmuFile.h" // For FindNtSymbolicLinkObjectByDriveLetter
#include "Common\EmuEEPROM.h" // For EEPROM
#include "common\EmuEEPROM.h" // For EEPROM
#include "devices\Xbox.h" // For g_SMBus, SMBUS_ADDRESS_SYSTEM_MICRO_CONTROLLER
#include "devices\SMCDevice.h" // For SMC_COMMAND_SCRATCH

2
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -56,7 +56,7 @@ namespace xboxkrnl
#include "core\kernel\exports\EmuKrnl.h"
#include "EmuShared.h"
#include "core\kernel\support\EmuXTL.h"
#include "core/HLE/Intercept.hpp"
#include "core\hle\Intercept.hpp"
#include "ReservedMemory.h" // For virtual_memory_placeholder
#include "core\kernel\memory-manager\VMManager.h"
#include "CxbxDebugger.h"

4
src/core/kernel/support/Emu.cpp
View File

@ -38,7 +38,7 @@
// prevent name collisions
namespace xboxkrnl
{
#include <xboxkrnl/xboxkrnl.h>
#include <xboxkrnl\xboxkrnl.h>
};
#include "core\kernel\init\CxbxKrnl.h"
@ -47,7 +47,7 @@ namespace xboxkrnl
#include "EmuFS.h"
#include "EmuXTL.h"
#include "EmuShared.h"
#include "core/HLE/Intercept.hpp"
#include "core\hle\Intercept.hpp"
#include "CxbxDebugger.h"
#ifdef _DEBUG

28
src/core/kernel/support/EmuXTL.h
View File

@ -38,20 +38,20 @@
namespace XTL
{
#include "core/HLE/XAPI/Xapi.h"
#include "core/HLE/D3D8/Direct3D9/Direct3D9.h"
#include "core/HLE/D3D8/XbConvert.h"
#include "core/HLE/D3D8/XbVertexBuffer.h"
#include "core/HLE/D3D8/XbPushBuffer.h"
#include "core/HLE/D3D8/XbVertexShader.h"
#include "core/HLE/D3D8/XbPixelShader.h"
#include "core/HLE/D3D8/XbState.h"
#include "core/HLE/XAPI/OHCI/XInput/DInput.h"
#include "core/HLE/DSOUND/DirectSound/DirectSound.hpp"
#include "core/HLE/XONLINE/XOnline.h"
#include "core/HLE/XGRAPHIC/XGraphic.h"
#include "core/HLE/XACTENG/XactEng.h"
#include "core/HLE/XAPI/OHCI/XInput/XInput.h"
#include "core\hle\XAPI\Xapi.h"
#include "core\hle\D3D8\Direct3D9/Direct3D9.h"
#include "core\hle\D3D8\XbConvert.h"
#include "core\hle\D3D8\XbVertexBuffer.h"
#include "core\hle\D3D8\XbPushBuffer.h"
#include "core\hle\D3D8\XbVertexShader.h"
#include "core\hle\D3D8\XbPixelShader.h"
#include "core\hle\D3D8\XbState.h"
#include "core\hle\XAPI\OHCI\XInput\DInput.h"
#include "core\hle\DSOUND\DirectSound\DirectSound.hpp"
#include "core\hle\XONLINE\XOnline.h"
#include "core\hle\XGRAPHIC\XGraphic.h"
#include "core\hle\XACTENG\XactEng.h"
#include "core\hle\XAPI\OHCI\XInput\XInput.h"
}
extern XTL::IDirect3DDevice *g_pD3DDevice;

2
src/devices/Xbox.cpp
View File

@ -36,7 +36,7 @@
#include "Xbox.h" // For HardwareModel
#include "common\xbe\Xbe.h" // Without this HLEIntercept complains about some undefined xbe variables
#include "core/HLE/Intercept.hpp"
#include "core\hle\Intercept.hpp"
PCIBus* g_PCIBus;
SMBus* g_SMBus;

4
src/devices/usb/XidGamepad.cpp
View File

@ -49,8 +49,8 @@ namespace xboxkrnl
#include "XidGamepad.h"
#include "USBDevice.h"
#include "Common/Input/InputConfig.h"
#include "Common/Input/SDL2_Device.h"
#include "common\Input\InputConfig.h"
#include "common\Input\SDL2_Device.h"
#include "OHCI.h"
#include "core\kernel\exports\EmuKrnl.h" // For EmuLog
#include "Logging.h"

4
src/devices/video/nv2a.cpp
View File

@ -50,7 +50,7 @@
// prevent name collisions
namespace xboxkrnl
{
#include <xboxkrnl/xboxkrnl.h> // For PKINTERRUPT, etc.
#include <xboxkrnl\xboxkrnl.h> // For PKINTERRUPT, etc.
};
#ifdef _MSC_VER // Check if MS Visual C compiler
@ -67,7 +67,7 @@ namespace xboxkrnl
#include "core\kernel\support\Emu.h"
#include "core\kernel\support\EmuFS.h"
#include "core\kernel\exports\EmuKrnl.h"
#include "core/HLE/Intercept.hpp"
#include "core\hle\Intercept.hpp"
#include "Logging.h"
#include "vga.h"

2
src/devices/x86/EmuX86.cpp
View File

@ -50,7 +50,7 @@
#include "core\kernel\init\CxbxKrnl.h"
#include "core\kernel\support\Emu.h" // For EmuLog
#include "devices\x86\EmuX86.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
#include "core\hle\Intercept.hpp" // for bLLE_GPU
#include <assert.h>
#include "devices\Xbox.h" // For g_PCIBus

2
src/gui/DbgConsole.cpp
View File

@ -39,7 +39,7 @@
#include "core\kernel\init\CxbxKrnl.h"
#include "core\kernel\support\Emu.h"
#include "DbgConsole.h"
#include "CxbxKrnl\ResourceTracker.h"
#include "core\hle\D3D8\ResourceTracker.h"
#include "core\kernel\support\EmuXTL.h"
#include <conio.h>

2
src/gui/DlgAudioConfig.cpp
View File

@ -34,7 +34,7 @@
// *
// ******************************************************************
#include "Common/Settings.hpp" // for g_Settings
#include "common\Settings.hpp" // for g_Settings
#include "DlgAudioConfig.h"
#include "ResCxbx.h"

4
src/gui/DlgControllerConfig.cpp
View File

@ -37,11 +37,11 @@
// Without this, you'll get a ton of errors from the std library for some unknown reason...
#include "Logging.h"
#include "Common/Settings.hpp" // for g_Settings
#include "common\Settings.hpp" // for g_Settings
#include "DlgControllerConfig.h"
#include "ResCxbx.h"
#include "Common/Win32/DInputController.h"
#include "common\Win32\DInputController.h"
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>

2
src/gui/DlgLoggingConfig.cpp
View File

@ -36,7 +36,7 @@
#include "EmuShared.h"
#include "DlgLoggingConfig.h"
#include "ResCxbx.h"
#include "Common/IPCHybrid.hpp"
#include "common\IPCHybrid.hpp"
static bool g_bHasChanges = false;

2
src/gui/DlgVideoConfig.cpp
View File

@ -37,7 +37,7 @@
// Without this, you'll get a ton of errors from the std library for some unknown reason...
#include "Logging.h"
#include "Common/Settings.hpp" // for g_Settings
#include "common\Settings.hpp" // for g_Settings
#include "DlgVideoConfig.h"
#include "ResCxbx.h"

2
src/gui/DlgXboxControllerPortMapping.cpp
View File

@ -37,7 +37,7 @@
// Without this, you'll get a ton of errors from the std library for some unknown reason...
#include "Logging.h"
#include "Common/Settings.hpp" // for g_Settings
#include "common\Settings.hpp" // for g_Settings
#include "DlgXboxControllerPortMapping.h"
#include "../Common/Win32/XBPortMapping.h"

2
src/gui/WinMain.cpp
View File

@ -39,7 +39,7 @@
#include "core\kernel\init\CxbxKrnl.h"
#include "core\kernel\support\Emu.h"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include <commctrl.h>
// Enable Visual Styles

2
src/gui/Wnd.h
View File

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

2
src/gui/WndMain.cpp
View File

@ -50,7 +50,7 @@
#include "common\xbe\XbePrinter.h" // For DumpInformation
#include "EmuShared.h"
#include "core\kernel\support\EmuXTL.h"
#include "Common/Settings.hpp"
#include "common\Settings.hpp"
#include "core\kernel\init\CxbxKrnl.h" // For CxbxConvertArgToString and CxbxExec
#include "ResCxbx.h"