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

Move Xapi, XInput, and DInput into their own folder 

Both XInput and DInput are migrated together. It's best to keep them in XInput folder.

As for Xapi files, may not require any plugin? Or possible put into their own folder?
This commit is contained in:
RadWolfie 2018-08-29 14:14:52 -05:00
parent 5ff6e9e6b5
commit a650e1e4f3
9 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/win32/Cxbx.vcxproj
View File

@ -227,7 +227,7 @@
<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\core\HLE\XAPI\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" />
@ -240,9 +240,9 @@
<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\core\HLE\XAPI\Xapi.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXG.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\XInput\XInput.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXTL.h" />
<ClInclude Include="..\..\src\CxbxKrnl\gloffscreen\glextensions.h" />
@ -419,12 +419,7 @@
<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\core\HLE\XAPI\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>
@ -472,19 +467,14 @@
<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\core\HLE\XAPI\Xapi.cpp" />
<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\core\HLE\XAPI\XInput\XInput.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

@ -109,8 +109,8 @@
<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\XInput\DInput.cpp">
<Filter>core\HLE\XAPI\XInput</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.cpp">
<Filter>core\HLE\DSound\DirectSound</Filter>
@ -133,14 +133,14 @@
<ClCompile Include="..\..\src\CxbxKrnl\EmuXactEng.cpp">
<Filter>Emulator</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>
<ClCompile Include="..\..\src\CxbxKrnl\EmuXInput.cpp">
<Filter>Emulator</Filter>
<ClCompile Include="..\..\src\core\HLE\XAPI\XInput\XInput.cpp">
<Filter>core\HLE\XAPI\XInput</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuXOnline.cpp">
<Filter>Emulator</Filter>
@ -386,8 +386,8 @@
<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\XInput\DInput.h">
<Filter>core\HLE\XAPI\XInput</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\DSound\DirectSound\DirectSound.hpp">
<Filter>core\HLE\DSound\DirectSound</Filter>
@ -407,14 +407,14 @@
<ClInclude Include="..\..\src\CxbxKrnl\EmuXactEng.h">
<Filter>Emulator</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>
<ClInclude Include="..\..\src\CxbxKrnl\EmuXInput.h">
<Filter>Emulator</Filter>
<ClInclude Include="..\..\src\core\HLE\XAPI\XInput\XInput.h">
<Filter>core\HLE\XAPI\XInput</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuXOnline.h">
<Filter>Emulator</Filter>
@ -777,6 +777,12 @@
<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\XInput">
<UniqueIdentifier>{69e32fa9-3fcd-400a-8d45-66b7ec3d555c}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\resource\Cxbx.rc">

6
src/CxbxKrnl/EmuXTL.h
View File

@ -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 "core/HLE/XAPI/XInput/DInput.h"
#include "core/HLE/DSound/DirectSound/DirectSound.hpp"
#include "EmuXOnline.h"
#include "EmuXG.h"
#include "EmuXactEng.h"
#include "EmuXInput.h"
#include "core/HLE/XAPI/XInput/XInput.h"
}
extern XTL::IDirect3DDevice *g_pD3DDevice;

8
src/CxbxKrnl/EmuDInput.cpp → src/core/HLE/XAPI/XInput/DInput.cpp
View File

@ -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"
// ******************************************************************

0
src/CxbxKrnl/EmuDInput.h → src/core/HLE/XAPI/XInput/DInput.h
View File

10
src/CxbxKrnl/EmuXInput.cpp → src/core/HLE/XAPI/XInput/XInput.cpp
View File

@ -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"

0
src/CxbxKrnl/EmuXInput.h → src/core/HLE/XAPI/XInput/XInput.h
View File

14
src/CxbxKrnl/EmuXapi.cpp → src/core/HLE/XAPI/Xapi.cpp
View File

@ -45,14 +45,14 @@ 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 "core/HLE/Intercept.hpp"
#include "CxbxVSBC/CxbxVSBC.h"

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