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 XGraphic to its own folder

This commit is contained in:
RadWolfie 2018-09-01 14:22:58 -05:00
parent 81d3ae8510
commit f083da6666
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/win32/Cxbx.vcxproj
View File

@ -241,7 +241,7 @@
<ClInclude Include="..\..\src\CxbxKrnl\EmuX86.h" />
<ClInclude Include="..\..\src\core\HLE\XACTENG\XactEng.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\Xapi.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuXG.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" />
@ -468,7 +468,7 @@
<ClCompile Include="..\..\src\CxbxKrnl\EmuX86.cpp" />
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuXG.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>

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

@ -136,8 +136,8 @@
<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\core\HLE\XAPI\OHCI\XInput\XInput.cpp">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@ -410,8 +410,8 @@
<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\core\HLE\XAPI\OHCI\XInput\XInput.h">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@ -792,6 +792,9 @@
<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>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\resource\Cxbx.rc">

2
src/CxbxKrnl/EmuXTL.h
View File

@ -49,7 +49,7 @@ namespace XTL
#include "core/HLE/XAPI/OHCI/XInput/DInput.h"
#include "core/HLE/DSound/DirectSound/DirectSound.hpp"
#include "core/HLE/XONLINE/XOnline.h"
#include "EmuXG.h"
#include "core/HLE/XGRAPHIC/XGraphic.h"
#include "core/HLE/XACTENG/XactEng.h"
#include "core/HLE/XAPI/OHCI/XInput/XInput.h"
}

12
src/CxbxKrnl/EmuXG.cpp → src/core/HLE/XGRAPHIC/XGraphic.cpp
View File

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

6
src/CxbxKrnl/EmuXG.h → src/core/HLE/XGRAPHIC/XGraphic.h
View File

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