Merge pull request #1425 from RadWolfie/move-source-files-to-their-own-folder-part1
Move source files to their own folder (Part 1)
This commit is contained in:
RadWolfie
GitHub
commit
4ea37624a6
|
|
@ -227,9 +227,9 @@
|
|||
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDInput.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDSound.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDSoundInline.hpp" />
|
||||
<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\CxbxKrnl\EmuFile.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuFS.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuKrnlAvModes.h" />
|
||||
|
|
@ -239,16 +239,16 @@
|
|||
<ClInclude Include="..\..\src\CxbxKrnl\EmuRsa.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuSha.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuX86.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXactEng.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXapi.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.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\CxbxKrnl\EmuXTL.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\gloffscreen\glextensions.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\gloffscreen\gloffscreen.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEIntercept.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEPatches.h" />
|
||||
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp" />
|
||||
<ClInclude Include="..\..\src\core\HLE\Patches.hpp" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\LibRc4.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\PhysicalMemory.h" />
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\PoolManager.h" />
|
||||
|
|
@ -419,18 +419,8 @@
|
|||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuDInput.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>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuDSound.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>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp" />
|
||||
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
@ -476,36 +466,21 @@
|
|||
<ClCompile Include="..\..\src\CxbxKrnl\EmuRsa.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuSha.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuX86.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXactEng.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXapi.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>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXG.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>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXInput.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.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">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp" />
|
||||
<ClCompile Include="..\..\src\core\HLE\XONLINE\XOnline.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\gloffscreen\glextensions.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\gloffscreen\gloffscreen_common.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\gloffscreen\gloffscreen_wgl.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\HLEIntercept.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>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\HLEPatches.cpp" />
|
||||
<ClCompile Include="..\..\src\core\HLE\Intercept.cpp" />
|
||||
<ClCompile Include="..\..\src\core\HLE\Patches.cpp" />
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\KernelThunk.cpp">
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
|
|||
|
|
@ -109,11 +109,11 @@
|
|||
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuDInput.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp">
|
||||
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuDSound.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp">
|
||||
<Filter>core\HLE\DSOUND\DirectSound</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
|
|
@ -130,23 +130,23 @@
|
|||
<ClCompile Include="..\..\src\Common\Win32\EmuShared.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXactEng.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp">
|
||||
<Filter>core\HLE\XACTENG</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXapi.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp">
|
||||
<Filter>core\HLE\XAPI</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXG.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp">
|
||||
<Filter>core\HLE\XGRAPHIC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXInput.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp">
|
||||
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\XONLINE\XOnline.cpp">
|
||||
<Filter>core\HLE\XONLINE</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\HLEIntercept.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClCompile Include="..\..\src\core\HLE\Intercept.cpp">
|
||||
<Filter>core\HLE</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\KernelThunk.cpp">
|
||||
<Filter>Kernel</Filter>
|
||||
|
|
@ -320,11 +320,6 @@
|
|||
<ClCompile Include="..\..\src\Common\Win32\IPCWindows.cpp">
|
||||
<Filter>Cross Platform\Win32</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\src\CxbxKrnl\HLEPatches.cpp">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\src\Cxbx\DlgControllerConfig.h">
|
||||
<Filter>GUI</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -391,11 +386,11 @@
|
|||
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDInput.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h">
|
||||
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDSound.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp">
|
||||
<Filter>core\HLE\DSOUND\DirectSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuFile.h">
|
||||
<Filter>Emulator</Filter>
|
||||
|
|
@ -409,26 +404,26 @@
|
|||
<ClInclude Include="..\..\src\CxbxKrnl\EmuSha.h">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXactEng.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XACTENG\XactEng.h">
|
||||
<Filter>core\HLE\XACTENG</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXapi.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h">
|
||||
<Filter>core\HLE\XAPI</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.h">
|
||||
<Filter>core\HLE\XGRAPHIC</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.h">
|
||||
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\XONLINE\XOnline.h">
|
||||
<Filter>core\HLE\XONLINE</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h">
|
||||
<Filter>Emulator</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEIntercept.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp">
|
||||
<Filter>core\HLE</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\LibRc4.h">
|
||||
<Filter>Emulator</Filter>
|
||||
|
|
@ -469,8 +464,8 @@
|
|||
<ClInclude Include="..\..\src\Common\XADPCM.h">
|
||||
<Filter>Shared</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\EmuDSoundInline.hpp">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp">
|
||||
<Filter>core\HLE\DSOUND\DirectSound</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\Cxbx\DlgAudioConfig.h">
|
||||
<Filter>GUI</Filter>
|
||||
|
|
@ -631,9 +626,12 @@
|
|||
<ClInclude Include="..\..\src\Common\IPCHybrid.hpp">
|
||||
<Filter>Cross Platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\src\CxbxKrnl\HLEPatches.h">
|
||||
<Filter>Emulator</Filter>
|
||||
<ClInclude Include="..\..\src\core\HLE\Patches.hpp">
|
||||
<Filter>core\HLE</Filter>
|
||||
</ClInclude>
|
||||
<ClCompile Include="..\..\src\core\HLE\Patches.cpp">
|
||||
<Filter>core\HLE</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\resource\Splash.jpg">
|
||||
|
|
@ -767,6 +765,39 @@
|
|||
<Filter Include="Shared\Input">
|
||||
<UniqueIdentifier>{76faeca9-d66f-43fb-9efa-ffb0668f8843}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core">
|
||||
<UniqueIdentifier>{6d7b4608-3bf3-401f-924e-52617798e6b8}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE">
|
||||
<UniqueIdentifier>{563da04b-4c54-4c1b-a055-809ce0f5bf97}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\DSOUND">
|
||||
<UniqueIdentifier>{5fcb96a1-736d-4749-ba21-a87dedc72427}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\DSOUND\DirectSound">
|
||||
<UniqueIdentifier>{9b3e7b4d-161e-4eeb-9338-3368e134b439}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XAPI">
|
||||
<UniqueIdentifier>{6f4e7159-1112-4a80-9e76-11963812811e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XAPI\OHCI">
|
||||
<UniqueIdentifier>{f9c6738c-bb93-4de5-b3ae-490f2d80fa74}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XAPI\OHCI\XInput">
|
||||
<UniqueIdentifier>{69e32fa9-3fcd-400a-8d45-66b7ec3d555c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XACTENG">
|
||||
<UniqueIdentifier>{dd1295ad-f875-47dc-a6bb-d5679452f236}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XONLINE">
|
||||
<UniqueIdentifier>{c6ea372d-ae98-46eb-917f-009302c000c5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\XGRAPHIC">
|
||||
<UniqueIdentifier>{c494f79e-ff8e-4b45-b1c3-1da0b4b9ee49}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="core\HLE\D3D8">
|
||||
<UniqueIdentifier>{6f39b9de-ab9d-4780-b687-2d930f86738e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\resource\Cxbx.rc">
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ namespace xboxkrnl
|
|||
#include "EmuKrnl.h"
|
||||
#include "EmuShared.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "HLEIntercept.h"
|
||||
#include "core/HLE/Intercept.hpp"
|
||||
#include "ReservedMemory.h" // For virtual_memory_placeholder
|
||||
#include "VMManager.h"
|
||||
#include "CxbxDebugger.h"
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace xboxkrnl
|
|||
#include "EmuFS.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuShared.h"
|
||||
#include "HLEIntercept.h"
|
||||
#include "core/HLE/Intercept.hpp"
|
||||
#include "CxbxDebugger.h"
|
||||
|
||||
#ifdef _DEBUG
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ namespace xboxkrnl
|
|||
#include "EmuXTL.h"
|
||||
#include "Logging.h"
|
||||
#include "EmuD3D8Logging.h"
|
||||
#include "HLEIntercept.h" // for bLLE_GPU
|
||||
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
|
||||
#include "Cxbx/ResCxbx.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
#include "CxbxKrnl.h"
|
||||
#include "Emu.h" // For EmuLog
|
||||
#include "EmuX86.h"
|
||||
#include "HLEIntercept.h" // for bLLE_GPU
|
||||
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
|
||||
|
||||
#include <assert.h>
|
||||
#include "devices\Xbox.h" // For g_PCIBus
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
namespace XTL
|
||||
{
|
||||
#include "EmuXapi.h"
|
||||
#include "core/HLE/XAPI/Xapi.h"
|
||||
#include "EmuD3D8.h"
|
||||
#include "EmuD3D8\Convert.h"
|
||||
#include "EmuD3D8\VertexBuffer.h"
|
||||
|
|
@ -46,12 +46,12 @@ namespace XTL
|
|||
#include "EmuD3D8\VertexShader.h"
|
||||
#include "EmuD3D8\PixelShader.h"
|
||||
#include "EmuD3D8\State.h"
|
||||
#include "EmuDInput.h"
|
||||
#include "EmuDSound.h"
|
||||
#include "EmuXOnline.h"
|
||||
#include "EmuXG.h"
|
||||
#include "EmuXactEng.h"
|
||||
#include "EmuXInput.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;
|
||||
|
|
|
|||
14
src/CxbxKrnl/EmuDSound.cpp → src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
Executable file → Normal file
14
src/CxbxKrnl/EmuDSound.cpp → src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
Executable file → Normal file
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDSound.cpp
|
||||
// * src->core->HLE->DSound->DirectSound->DirectSound.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -45,11 +45,11 @@ namespace xboxkrnl {
|
|||
|
||||
#include <dsound.h>
|
||||
#include <thread>
|
||||
#include "CxbxKrnl.h"
|
||||
#include "Emu.h"
|
||||
#include "EmuFS.h"
|
||||
#include "EmuShared.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "CxbxKrnl/CxbxKrnl.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "Common/Settings.hpp"
|
||||
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ static void dsound_thread_worker(LPVOID);
|
|||
EmuLog(LOG_PREFIX, LOG_LEVEL::WARNING, "An issue has been found. Please report game title and console's output of return result," \
|
||||
" function, and file name to https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/issues/485"); } return hRet; }
|
||||
|
||||
#include "EmuDSoundInline.hpp"
|
||||
#include "DirectSoundInline.hpp"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
2
src/CxbxKrnl/EmuDSound.h → src/core/HLE/DSOUND/DirectSound/DirectSound.hpp
Executable file → Normal file
2
src/CxbxKrnl/EmuDSound.h → src/core/HLE/DSOUND/DirectSound/DirectSound.hpp
Executable file → Normal file
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDSound.h
|
||||
// * src->core->HLE->DSound->DirectSound->DirectSound.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDSoundInline.hpp
|
||||
// * src->core->HLE->DSound->DirectSound->DirectSoundInline.hpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->HLEIntercept.cpp
|
||||
// * src->core->HLE->Intercept.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -38,18 +38,18 @@
|
|||
|
||||
#include <cmath>
|
||||
#include <iomanip> // For std::setfill and std::setw
|
||||
#include "CxbxKrnl.h"
|
||||
#include "Emu.h"
|
||||
#include "EmuFS.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuShared.h"
|
||||
#include "CxbxDebugger.h"
|
||||
#include "CxbxKrnl/CxbxKrnl.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "Common/CxbxDebugger.h"
|
||||
#include "Logging.h"
|
||||
#pragma comment(lib, "XbSymbolDatabase.lib")
|
||||
#include "../../import/XbSymbolDatabase/XbSymbolDatabase.h"
|
||||
#include "HLEIntercept.h"
|
||||
#include "HLEPatches.h"
|
||||
#include "xxhash32.h"
|
||||
#include "Intercept.hpp"
|
||||
#include "Patches.hpp"
|
||||
#include "CxbxKrnl/xxhash32.h"
|
||||
#include <Shlwapi.h>
|
||||
#include <shlobj.h>
|
||||
#include <unordered_map>
|
||||
|
|
@ -60,19 +60,19 @@ std::map<std::string, xbaddr> g_SymbolAddresses;
|
|||
bool g_HLECacheUsed = false;
|
||||
|
||||
// D3D build version
|
||||
uint32 g_BuildVersion = 0;
|
||||
|
||||
uint32 g_BuildVersion = 0;
|
||||
|
||||
bool bLLE_APU = false; // Set this to true for experimental APU (sound) LLE
|
||||
bool bLLE_GPU = false; // Set this to true for experimental GPU (graphics) LLE
|
||||
bool bLLE_GPU = false; // Set this to true for experimental GPU (graphics) LLE
|
||||
bool bLLE_USB = false; // Set this to true for experimental USB (input) LLE
|
||||
bool bLLE_JIT = false; // Set this to true for experimental JIT
|
||||
|
||||
void* GetXboxFunctionPointer(std::string functionName)
|
||||
{
|
||||
void* ptr = GetPatchedFunctionTrampoline(functionName);
|
||||
if (ptr != nullptr) {
|
||||
return ptr;
|
||||
}
|
||||
{
|
||||
void* ptr = GetPatchedFunctionTrampoline(functionName);
|
||||
if (ptr != nullptr) {
|
||||
return ptr;
|
||||
}
|
||||
|
||||
// If we got here, the function wasn't patched, so we can just look it up the HLE cache
|
||||
// and return the correct offset
|
||||
|
|
@ -134,7 +134,7 @@ bool VerifySymbolAddressAgainstXRef(char *SymbolName, xbaddr Address, int XRef)
|
|||
}
|
||||
|
||||
// For XREF_D3DTSS_TEXCOORDINDEX, Kabuki Warriors hits this case
|
||||
CxbxPopupMessage(LOG_PREFIX, LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn,
|
||||
CxbxPopupMessage(LOG_PREFIX, LOG_LEVEL::WARNING, CxbxMsgDlgIcon_Warn,
|
||||
"Verification of %s failed : XREF was 0x%.8X while lookup gave 0x%.8X", SymbolName, XRefAddr, Address);
|
||||
// For XREF_D3DTSS_TEXCOORDINDEX, Kabuki Warriors hits this case
|
||||
return false;
|
||||
|
|
@ -266,10 +266,10 @@ void CDECL EmuRegisterSymbol(const char* library_str,
|
|||
output << "\t*NO PATCH AVAILABLE!*";
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
output << "\n";
|
||||
|
||||
#endif
|
||||
|
||||
output << "\n";
|
||||
|
||||
g_SymbolAddresses[symbol_str] = func_addr;
|
||||
printf(output.str().c_str());
|
||||
}
|
||||
|
|
@ -316,16 +316,16 @@ uint EmuUpdateLLEStatus(uint32_t XbLibScan)
|
|||
bLLE_APU = true;
|
||||
FlagsLLE ^= LLE_APU;
|
||||
EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE APU.");
|
||||
}
|
||||
#if 0 // Reenable this when LLE USB actually works
|
||||
}
|
||||
#if 0 // Reenable this when LLE USB actually works
|
||||
if ((FlagsLLE & LLE_USB) == false
|
||||
&& (XbLibScan & XbSymbolLib_XAPILIB) == 0) {
|
||||
bLLE_USB = true;
|
||||
FlagsLLE ^= LLE_USB;
|
||||
EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE USB.");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
ipc_send_gui_update(IPC_UPDATE_GUI::LLE_FLAGS, FlagsLLE);
|
||||
ipc_send_gui_update(IPC_UPDATE_GUI::LLE_FLAGS, FlagsLLE);
|
||||
return FlagsLLE;
|
||||
}
|
||||
|
||||
|
|
@ -472,8 +472,8 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
|
|||
}
|
||||
|
||||
// If the HLE Cache was used, go straight to patching, no need to re-scan
|
||||
if (g_HLECacheUsed) {
|
||||
EmuInstallPatches();
|
||||
if (g_HLECacheUsed) {
|
||||
EmuInstallPatches();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -574,7 +574,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
|
|||
std::stringstream cacheAddress;
|
||||
cacheAddress << std::hex << (*it).second;
|
||||
WritePrivateProfileString("Symbols", (*it).first.c_str(), cacheAddress.str().c_str(), filename.c_str());
|
||||
}
|
||||
}
|
||||
EmuInstallPatches();
|
||||
}
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->HLEIntercept.h
|
||||
// * src->core->HLE->Intercept.hpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,13 +31,13 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef HLEINTERCEPT_H
|
||||
#define HLEINTERCEPT_H
|
||||
#ifndef HLEINTERCEPT_HPP
|
||||
#define HLEINTERCEPT_HPP
|
||||
|
||||
#include <map>
|
||||
|
||||
extern bool bLLE_APU; // Set this to true for experimental APU (sound) LLE
|
||||
extern bool bLLE_GPU; // Set this to true for experimental GPU (graphics) LLE
|
||||
extern bool bLLE_GPU; // Set this to true for experimental GPU (graphics) LLE
|
||||
extern bool bLLE_USB; // Set this to true for experimental USB (input) LLE
|
||||
extern bool bLLE_JIT; // Set this to true for experimental JIT
|
||||
|
||||
|
|
@ -57,4 +57,4 @@ void* GetXboxFunctionPointer(std::string functionName);
|
|||
void VerifyHLEDataBase();
|
||||
#endif
|
||||
|
||||
#endif // HLEINTERCEPT_H
|
||||
#endif
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->HLEPatches.cpp
|
||||
// * src->core->HLE->Patches.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -35,11 +35,11 @@
|
|||
// *
|
||||
// ******************************************************************
|
||||
|
||||
#include "CxbxKrnl.h"
|
||||
#include "Emu.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "HLEPatches.h"
|
||||
#include "HLEIntercept.h"
|
||||
#include "CxbxKrnl/CxbxKrnl.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "Patches.hpp"
|
||||
#include "Intercept.hpp"
|
||||
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->HLEPatches.h
|
||||
// * src->core->HLE->Patches.hpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,12 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef HLEPATCHES_HPP
|
||||
#define HLEPATCHES_HPP
|
||||
|
||||
#include <string>
|
||||
|
||||
void EmuInstallPatches();
|
||||
void* GetPatchedFunctionTrampoline(std::string functionName);
|
||||
|
||||
#endif
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXactEng.cpp
|
||||
// * src->core->HLE->XACTENG->XactEng.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -43,13 +43,13 @@ namespace xboxkrnl
|
|||
#include <xboxkrnl/xboxkrnl.h>
|
||||
};
|
||||
|
||||
#include "CxbxKrnl.h"
|
||||
#include "Logging.h"
|
||||
#include "Emu.h"
|
||||
#include "EmuFS.h"
|
||||
#include "EmuShared.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "VMManager.h"
|
||||
#include "CxbxKrnl/CxbxKrnl.h"
|
||||
#include "Common/Logging.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/VMManager.h"
|
||||
|
||||
#include <mmreg.h>
|
||||
#include <msacm.h>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXactEng.h
|
||||
// * src->core->HLE->XACTENG->XactEng.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -352,4 +352,4 @@ HRESULT WINAPI EMUPATCH(IXACTEngine_UnRegisterWaveBank)
|
|||
X_XACTWaveBank* pWaveBank
|
||||
);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDInput.cpp
|
||||
// * src->core->HLE->XAPI->OHCI->XInput->DInput.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -37,10 +37,10 @@
|
|||
|
||||
#define LOG_PREFIX CXBXR_MODULE::DINP
|
||||
|
||||
#include "Emu.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuShared.h"
|
||||
#include "Common/Win32/DInputController.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "Common/Win32/DInputController.h"
|
||||
#include "Logging.h"
|
||||
|
||||
// ******************************************************************
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDInput.h
|
||||
// * src->core->HLE->XAPI->OHCI->XInput->DInput.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef EMUDINPUT_H
|
||||
#define EMUDINPUT_H
|
||||
#ifndef DINPUT_H
|
||||
#define DINPUT_H
|
||||
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#include <dinput.h>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuDInput.cpp
|
||||
// * src->core->HLE->XAPI->OHCI->XInput->DInput.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -37,12 +37,12 @@
|
|||
|
||||
#define LOG_PREFIX CXBXR_MODULE::XINP
|
||||
|
||||
#include "Emu.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuShared.h"
|
||||
#include "EmuXInput.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "XInput.h"
|
||||
|
||||
#include <xinput.h>
|
||||
#include <xinput.h>
|
||||
#include "Logging.h"
|
||||
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXInput.h
|
||||
// * src->core->HLE->XAPI->OHCI->XInput->XInput.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef EMUXINPUT_H
|
||||
#define EMUXINPUT_H
|
||||
#ifndef XINPUT_H
|
||||
#define XINPUT_H
|
||||
|
||||
//query the total connected xinput gamepad
|
||||
DWORD XInputGamepad_Connected(void);
|
||||
|
|
@ -45,16 +45,16 @@ namespace xboxkrnl
|
|||
};
|
||||
|
||||
#include <Shlwapi.h>
|
||||
#include "CxbxKrnl.h"
|
||||
#include "CxbxKrnl/CxbxKrnl.h"
|
||||
#include "Logging.h"
|
||||
#include "Emu.h"
|
||||
#include "EmuKrnl.h" // For DefaultLaunchDataPage
|
||||
#include "EmuFile.h"
|
||||
#include "EmuFS.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuShared.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuKrnl.h" // For DefaultLaunchDataPage
|
||||
#include "CxbxKrnl/EmuFile.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/EmuShared.h"
|
||||
#include "../Common/Win32/XBPortMapping.h"
|
||||
#include "HLEIntercept.h"
|
||||
#include "core/HLE/Intercept.hpp"
|
||||
#include "CxbxVSBC/CxbxVSBC.h"
|
||||
#include "Windef.h"
|
||||
#include <vector>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXapi.h
|
||||
// * src->core->HLE->XAPI->Xapi.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef EMUXAPI_H
|
||||
#define EMUXAPI_H
|
||||
#ifndef XAPI_H
|
||||
#define XAPI_H
|
||||
|
||||
// ******************************************************************
|
||||
// * calling conventions
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXG.cpp
|
||||
// * core->HLE->XGRAPHIC->XGraphic.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -40,11 +40,11 @@
|
|||
#undef FIELD_OFFSET // prevent macro redefinition warnings
|
||||
#include <windows.h>
|
||||
|
||||
#include "Emu.h"
|
||||
#include "EmuFS.h"
|
||||
#include "Logging.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "EmuD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "Common/Logging.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
#include "CxbxKrnl/EmuD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
|
||||
|
||||
// ******************************************************************
|
||||
// * patch: XGIsSwizzledFormat
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXG.h
|
||||
// * core->HLE->XGRAPHIC->XGraphic.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef EMUXG_H
|
||||
#define EMUXG_H
|
||||
#ifndef XGRAPHIC_H
|
||||
#define XGRAPHIC_H
|
||||
|
||||
typedef struct _XGPOINT3D
|
||||
{
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXOnline.cpp
|
||||
// * src->core->HLE->XONLINE->XOnline.cpp
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -37,10 +37,10 @@
|
|||
|
||||
#define LOG_PREFIX CXBXR_MODULE::XONLINE
|
||||
|
||||
#include "Emu.h"
|
||||
#include "Logging.h"
|
||||
#include "EmuFS.h"
|
||||
#include "EmuXTL.h"
|
||||
#include "CxbxKrnl/Emu.h"
|
||||
#include "Common/Logging.h"
|
||||
#include "CxbxKrnl/EmuFS.h"
|
||||
#include "CxbxKrnl/EmuXTL.h"
|
||||
|
||||
/*
|
||||
// ******************************************************************
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
|
||||
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
|
||||
// *
|
||||
// * Cxbx->Win32->CxbxKrnl->EmuXOnline.h
|
||||
// * src->core->HLE->XONLINE->XOnline.h
|
||||
// *
|
||||
// * This file is part of the Cxbx project.
|
||||
// *
|
||||
|
|
@ -31,8 +31,8 @@
|
|||
// * All rights reserved
|
||||
// *
|
||||
// ******************************************************************
|
||||
#ifndef EMUXONLINE_H
|
||||
#define EMUXONLINE_H
|
||||
#ifndef XONLINE_H
|
||||
#define XONLINE_H
|
||||
|
||||
|
||||
// Flags returned by XNetGetEthernetLinkStatus()
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "Xbox.h" // For HardwareModel
|
||||
#include "Xbe.h" // Without this HLEIntercept complains about some undefined xbe variables
|
||||
#include "..\CxbxKrnl\HLEIntercept.h"
|
||||
#include "core/HLE/Intercept.hpp"
|
||||
|
||||
PCIBus* g_PCIBus;
|
||||
SMBus* g_SMBus;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ namespace xboxkrnl
|
|||
#include "CxbxKrnl\Emu.h"
|
||||
#include "CxbxKrnl\EmuFS.h"
|
||||
#include "CxbxKrnl\EmuKrnl.h"
|
||||
#include "CxbxKrnl\HLEIntercept.h"
|
||||
#include "core/HLE/Intercept.hpp"
|
||||
#include "Logging.h"
|
||||
|
||||
#include "vga.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue