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

Created xbe folder

This commit is contained in:
ergo720 2018-12-15 14:59:34 +01:00
parent b0523ecae5
commit 3d46f35174
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/win32/Cxbx.vcxproj
View File

@ -207,7 +207,7 @@
<ClInclude Include="..\..\src\Common\CxbxDebugger.h" />
<ClInclude Include="..\..\src\Common\Win32\XBPortMapping.h" />
<ClInclude Include="..\..\src\Common\XADPCM.h" />
<ClInclude Include="..\..\src\Common\XbePrinter.h" />
<ClInclude Include="..\..\src\common\xbe\XbePrinter.h" />
<ClInclude Include="..\..\src\CxbxKrnl\crc32c.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h" />
<ClInclude Include="..\..\src\Common\EmuEEPROM.h" />
@ -273,7 +273,7 @@
<ClInclude Include="..\..\src\Cxbx\Wnd.h" />
<ClInclude Include="..\..\src\Cxbx\WndMain.h" />
<ClInclude Include="..\..\src\Common\Win32\DInputController.h" />
<ClInclude Include="..\..\src\Common\Xbe.h" />
<ClInclude Include="..\..\src\common\xbe\Xbe.h" />
<ClInclude Include="..\..\src\devices\ADM1032Device.h" />
<ClInclude Include="..\..\src\devices\EEPROMDevice.h" />
<ClInclude Include="..\..\src\devices\EmuNVNet.h" />
@ -351,7 +351,7 @@
<ClCompile Include="..\..\src\Common\Win32\Threads.cpp" />
<ClCompile Include="..\..\src\Common\CxbxDebugger.cpp" />
<ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp" />
<ClCompile Include="..\..\src\Common\XbePrinter.cpp" />
<ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\crc32c.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp" />
<ClCompile Include="..\..\src\Common\EmuEEPROM.cpp" />
@ -518,7 +518,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Common\Xbe.cpp">
<ClCompile Include="..\..\src\common\xbe\Xbe.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

@ -94,7 +94,7 @@
<ClCompile Include="..\..\src\Common\Win32\Mutex.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Xbe.cpp">
<ClCompile Include="..\..\src\common\xbe\Xbe.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\CxbxKrnl.cpp">
@ -208,7 +208,7 @@
<ClCompile Include="..\..\src\devices\Xbox.cpp">
<Filter>Hardware</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\XbePrinter.cpp">
<ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\Threads.cpp">
@ -371,7 +371,7 @@
<ClInclude Include="..\..\src\Cxbx\ResCxbx.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Xbe.h">
<ClInclude Include="..\..\src\common\xbe\Xbe.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h">
@ -503,7 +503,7 @@
<ClInclude Include="..\..\src\Common\CxbxDebugger.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\XbePrinter.h">
<ClInclude Include="..\..\src\common\xbe\XbePrinter.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\Threads.h">

2
src/Cxbx/WndMain.cpp
View File

@ -47,7 +47,7 @@
#include "DlgEepromConfig.h"
#include "DlgLoggingConfig.h"
#include "DlgXboxControllerPortMapping.h"
#include "Common/XbePrinter.h" // For DumpInformation
#include "common\xbe\XbePrinter.h" // For DumpInformation
#include "CxbxKrnl/EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "Common/Settings.hpp"

2
src/Cxbx/WndMain.h
View File

@ -35,7 +35,7 @@
#define WNDMAIN_H
#include "Wnd.h"
#include "Common/Xbe.h"
#include "common\xbe\/Xbe.h"
#include <thread>

2
src/CxbxKrnl/CxbxKrnl.h
View File

@ -35,7 +35,7 @@
#define CXBXKRNL_H
#include "Cxbx.h"
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
#include "Logging.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings

2
src/CxbxKrnl/Emu.h
View File

@ -34,7 +34,7 @@
#ifndef EMU_H
#define EMU_H
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
#include "Logging.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings

4
src/CxbxKrnl/EmuFS.h
View File

@ -35,7 +35,7 @@
#define EMUFS_H
#include <vector>
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings
#include <windows.h>
@ -51,4 +51,4 @@ typedef struct
void* functionPtr;
}fs_instruction_t;
#endif
#endif

2
src/common/XADPCM.h
View File

@ -34,7 +34,7 @@
#ifndef XBOXADPCM_H
#define XBOXADPCM_H
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
/*
TXboxAdpcmDecoder 0.1.3

2
src/common/Xbe.cpp → src/common/xbe/Xbe.cpp
View File

@ -41,7 +41,7 @@ namespace xboxkrnl
#include <xboxkrnl/xboxkrnl.h>
};
#include "Xbe.h"
#include "common\xbe\Xbe.h"
#include "CxbxUtil.h" // For RoundUp
#include <experimental/filesystem> // filesystem related functions available on C++ 17
#include <locale> // For ctime

0
src/common/Xbe.h → src/common/xbe/Xbe.h
View File

2
src/common/XbePrinter.cpp → src/common/xbe/XbePrinter.cpp
View File

@ -34,7 +34,7 @@
// *
// ******************************************************************
#include "XbePrinter.h"
#include "common\xbe\XbePrinter.h"
#include "CxbxVersion.h" // For _CXBX_VERSION
#include <locale> // For ctime

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

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

2
src/core/HLE/D3D8/Direct3D9/Direct3D9.h
View File

@ -36,7 +36,7 @@
#include "../XbD3D8Types.h"
#include "CxbxKrnl/CxbxKrnl.h"
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
#include "CxbxKrnl/Emu.h"
#define DIRECTDRAW_VERSION 0x0700

2
src/core/HLE/XACTENG/XactEng.h
View File

@ -34,7 +34,7 @@
#ifndef EMUXACTENG_H
#define EMUXACTENG_H
#include "Common/Xbe.h"
#include "common\xbe\Xbe.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings
#include <windows.h>

2
src/devices/Xbox.cpp
View File

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