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

Renamed some folders + moved EmuShared.h

This commit is contained in:
ergo720 2018-12-15 17:28:01 +01:00
parent c5e7824475
commit e6e93a2d4a
42 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
build/win32/Cxbx.vcxproj
View File

@ -199,23 +199,23 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\common\util\CxbxCommon.h" />
<ClInclude Include="..\..\src\Common\Input\InputConfig.h" />
<ClInclude Include="..\..\src\Common\Input\SDL2_Device.h" />
<ClInclude Include="..\..\src\Common\IPCHybrid.hpp" />
<ClInclude Include="..\..\src\Common\Settings.hpp" />
<ClInclude Include="..\..\src\Common\Win32\Threads.h" />
<ClInclude Include="..\..\src\Common\CxbxDebugger.h" />
<ClInclude Include="..\..\src\Common\Win32\XBPortMapping.h" />
<ClInclude Include="..\..\src\Common\XADPCM.h" />
<ClInclude Include="..\..\src\common\input\InputConfig.h" />
<ClInclude Include="..\..\src\common\input\SDL2_Device.h" />
<ClInclude Include="..\..\src\common\IPCHybrid.hpp" />
<ClInclude Include="..\..\src\common\Settings.hpp" />
<ClInclude Include="..\..\src\common\win32\Threads.h" />
<ClInclude Include="..\..\src\common\CxbxDebugger.h" />
<ClInclude Include="..\..\src\common\win32\XBPortMapping.h" />
<ClInclude Include="..\..\src\common\XADPCM.h" />
<ClInclude Include="..\..\src\common\xbe\XbePrinter.h" />
<ClInclude Include="..\..\src\common\util\crc32c.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h" />
<ClInclude Include="..\..\src\Common\EmuEEPROM.h" />
<ClInclude Include="..\..\src\Common\Logging.h" />
<ClInclude Include="..\..\src\Common\Win32\AlignPosfix1.h" />
<ClInclude Include="..\..\src\Common\Win32\AlignPrefix1.h" />
<ClInclude Include="..\..\src\Common\XDVDFS Tools\buffered_io.h" />
<ClInclude Include="..\..\src\Common\XDVDFS Tools\xdvdfs.h" />
<ClInclude Include="..\..\src\common\EmuEEPROM.h" />
<ClInclude Include="..\..\src\common\Logging.h" />
<ClInclude Include="..\..\src\common\win32\AlignPosfix1.h" />
<ClInclude Include="..\..\src\common\win32\AlignPrefix1.h" />
<ClInclude Include="..\..\src\common\xdvdfs-tools\buffered_io.h" />
<ClInclude Include="..\..\src\common\xdvdfs-tools\xdvdfs.h" />
<ClInclude Include="..\..\src\Cxbx.h" />
<ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h" />
<ClInclude Include="..\..\src\gui\DbgConsole.h" />
@ -265,14 +265,14 @@
<ClInclude Include="..\..\src\gui\DlgLoggingConfig.h" />
<ClInclude Include="..\..\src\gui\DlgVideoConfig.h" />
<ClInclude Include="..\..\src\CxbxKrnl\Emu.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuShared.h" />
<ClInclude Include="..\..\src\Common\Error.h" />
<ClInclude Include="..\..\src\Common\Win32\Mutex.h" />
<ClInclude Include="..\..\src\common\win32\EmuShared.h" />
<ClInclude Include="..\..\src\common\Error.h" />
<ClInclude Include="..\..\src\common\win32\Mutex.h" />
<ClInclude Include="..\..\src\gui\DlgXboxControllerPortMapping.h" />
<ClInclude Include="..\..\src\gui\ResCxbx.h" />
<ClInclude Include="..\..\src\gui\Wnd.h" />
<ClInclude Include="..\..\src\gui\WndMain.h" />
<ClInclude Include="..\..\src\Common\Win32\DInputController.h" />
<ClInclude Include="..\..\src\common\win32\DInputController.h" />
<ClInclude Include="..\..\src\common\xbe\Xbe.h" />
<ClInclude Include="..\..\src\devices\ADM1032Device.h" />
<ClInclude Include="..\..\src\devices\EEPROMDevice.h" />
@ -343,27 +343,27 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\common\util\CxbxCommon.cpp" />
<ClCompile Include="..\..\src\Common\Input\InputConfig.cpp" />
<ClCompile Include="..\..\src\Common\Input\SDL2_Device.cpp" />
<ClCompile Include="..\..\src\Common\Settings.cpp" />
<ClCompile Include="..\..\src\Common\Win32\InlineFunc.cpp" />
<ClCompile Include="..\..\src\Common\Win32\IPCWindows.cpp" />
<ClCompile Include="..\..\src\Common\Win32\Threads.cpp" />
<ClCompile Include="..\..\src\Common\CxbxDebugger.cpp" />
<ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp" />
<ClCompile Include="..\..\src\common\input\InputConfig.cpp" />
<ClCompile Include="..\..\src\common\input\SDL2_Device.cpp" />
<ClCompile Include="..\..\src\common\Settings.cpp" />
<ClCompile Include="..\..\src\common\win32\InlineFunc.cpp" />
<ClCompile Include="..\..\src\common\win32\IPCWindows.cpp" />
<ClCompile Include="..\..\src\common\win32\Threads.cpp" />
<ClCompile Include="..\..\src\common\CxbxDebugger.cpp" />
<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\Common\EmuEEPROM.cpp" />
<ClCompile Include="..\..\src\Common\Logging.cpp" />
<ClCompile Include="..\..\src\Common\Win32\EmuShared.cpp">
<ClCompile Include="..\..\src\common\EmuEEPROM.cpp" />
<ClCompile Include="..\..\src\common\Logging.cpp" />
<ClCompile Include="..\..\src\common\win32\EmuShared.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\Common\XDVDFS Tools\buffered_io.cpp" />
<ClCompile Include="..\..\src\Common\XDVDFS Tools\xdvdfs.cpp" />
<ClCompile Include="..\..\src\common\xdvdfs-tools\buffered_io.cpp" />
<ClCompile Include="..\..\src\common\xdvdfs-tools\xdvdfs.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\CxbxKrnl.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -481,13 +481,13 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Common\Error.cpp">
<ClCompile Include="..\..\src\common\Error.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>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\Mutex.cpp">
<ClCompile Include="..\..\src\common\win32\Mutex.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>
@ -512,7 +512,7 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\DInputController.cpp">
<ClCompile Include="..\..\src\common\win32\DInputController.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>

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

@ -88,10 +88,10 @@
<ClCompile Include="..\..\src\CxbxKrnl\EmuKrnlXe.cpp">
<Filter>Kernel</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Error.cpp">
<ClCompile Include="..\..\src\common\Error.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\Mutex.cpp">
<ClCompile Include="..\..\src\common\win32\Mutex.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\xbe\Xbe.cpp">
@ -127,7 +127,7 @@
<ClCompile Include="..\..\src\common\crypto\EmuSha.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\EmuShared.cpp">
<ClCompile Include="..\..\src\common\win32\EmuShared.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp">
@ -154,19 +154,19 @@
<ClCompile Include="..\..\src\common\crypto\LibRc4.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Logging.cpp">
<ClCompile Include="..\..\src\common\Logging.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\ResourceTracker.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\XDVDFS Tools\xdvdfs.cpp">
<ClCompile Include="..\..\src\common\xdvdfs-tools\xdvdfs.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\XDVDFS Tools\buffered_io.cpp">
<ClCompile Include="..\..\src\common\xdvdfs-tools\buffered_io.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\EmuEEPROM.cpp">
<ClCompile Include="..\..\src\common\EmuEEPROM.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\DlgAbout.cpp">
@ -202,7 +202,7 @@
<ClCompile Include="..\..\src\devices\SMDevice.cpp">
<Filter>Hardware</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\CxbxDebugger.cpp">
<ClCompile Include="..\..\src\common\CxbxDebugger.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\Xbox.cpp">
@ -211,7 +211,7 @@
<ClCompile Include="..\..\src\common\xbe\XbePrinter.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\Threads.cpp">
<ClCompile Include="..\..\src\common\win32\Threads.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\MCPXDevice.cpp">
@ -290,34 +290,34 @@
<ClCompile Include="..\..\src\gui\DlgXboxControllerPortMapping.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp">
<ClCompile Include="..\..\src\common\win32\XBPortMapping.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\xbdm\CxbxXbdm.cpp">
<Filter>Kernel</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\InlineFunc.cpp">
<ClCompile Include="..\..\src\common\win32\InlineFunc.cpp">
<Filter>Cross Platform\Win32</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Input\InputConfig.cpp">
<ClCompile Include="..\..\src\common\input\InputConfig.cpp">
<Filter>Shared\Input</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Input\SDL2_Device.cpp">
<ClCompile Include="..\..\src\common\input\SDL2_Device.cpp">
<Filter>Shared\Input</Filter>
</ClCompile>
<ClCompile Include="..\..\src\common\util\CxbxCommon.cpp">
<Filter>Cross Platform</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Settings.cpp">
<ClCompile Include="..\..\src\common\Settings.cpp">
<Filter>Cross Platform</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\DInputController.cpp">
<ClCompile Include="..\..\src\common\win32\DInputController.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\gui\DlgLoggingConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\IPCWindows.cpp">
<ClCompile Include="..\..\src\common\win32\IPCWindows.cpp">
<Filter>Cross Platform\Win32</Filter>
</ClCompile>
<ClInclude Include="..\..\src\gui\DlgControllerConfig.h">
@ -359,13 +359,13 @@
<ClInclude Include="..\..\src\CxbxKrnl\Emu.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuShared.h">
<ClInclude Include="..\..\src\common\win32\EmuShared.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Error.h">
<ClInclude Include="..\..\src\common\Error.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\Mutex.h">
<ClInclude Include="..\..\src\common\win32\Mutex.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\ResCxbx.h">
@ -428,7 +428,7 @@
<ClInclude Include="..\..\src\common\crypto\LibRc4.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Logging.h">
<ClInclude Include="..\..\src\common\Logging.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h">
@ -437,19 +437,19 @@
<ClInclude Include="..\..\src\CxbxKrnl\ReservedMemory.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\AlignPosfix1.h">
<ClInclude Include="..\..\src\common\win32\AlignPosfix1.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\AlignPrefix1.h">
<ClInclude Include="..\..\src\common\win32\AlignPrefix1.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\XDVDFS Tools\buffered_io.h">
<ClInclude Include="..\..\src\common\xdvdfs-tools\buffered_io.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\XDVDFS Tools\xdvdfs.h">
<ClInclude Include="..\..\src\common\xdvdfs-tools\xdvdfs.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\EmuEEPROM.h">
<ClInclude Include="..\..\src\common\EmuEEPROM.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxVersion.h">
@ -461,7 +461,7 @@
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\XADPCM.h">
<ClInclude Include="..\..\src\common\XADPCM.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp">
@ -500,13 +500,13 @@
<ClInclude Include="..\..\src\devices\Xbox.h">
<Filter>Hardware</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\CxbxDebugger.h">
<ClInclude Include="..\..\src\common\CxbxDebugger.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\xbe\XbePrinter.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\Threads.h">
<ClInclude Include="..\..\src\common\win32\Threads.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\devices\MCPXDevice.h">
@ -602,28 +602,28 @@
<ClInclude Include="..\..\src\gui\DlgXboxControllerPortMapping.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\XBPortMapping.h">
<ClInclude Include="..\..\src\common\win32\XBPortMapping.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Input\InputConfig.h">
<ClInclude Include="..\..\src\common\input\InputConfig.h">
<Filter>Shared\Input</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Input\SDL2_Device.h">
<ClInclude Include="..\..\src\common\input\SDL2_Device.h">
<Filter>Shared\Input</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\util\CxbxCommon.h">
<Filter>Cross Platform</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Settings.hpp">
<ClInclude Include="..\..\src\common\Settings.hpp">
<Filter>Cross Platform</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\DInputController.h">
<ClInclude Include="..\..\src\common\win32\DInputController.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\gui\DlgLoggingConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\IPCHybrid.hpp">
<ClInclude Include="..\..\src\common\IPCHybrid.hpp">
<Filter>Cross Platform</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\Patches.hpp">

2
src/common/CxbxDebugger.cpp
View File

@ -33,7 +33,7 @@
// ******************************************************************
#include "Cxbx.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "CxbxDebugger.h"
// Note this implementation uses SEH. See the reference docs for RaiseException:

2
src/common/Logging.cpp
View File

@ -38,7 +38,7 @@
#include "Logging.h"
#include "Common/Settings.hpp"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
// For thread_local, see : http://en.cppreference.com/w/cpp/language/storage_duration
// TODO : Use Boost.Format http://www.boost.org/doc/libs/1_53_0/libs/format/index.html

4
src/common/ReservedMemory.h
View File

@ -40,7 +40,7 @@ extern "C"
{
#endif
#include "CxbxKrnl/EmuShared.h" // For XBE_MAX_VA, XBE_IMAGE_BASE and CXBX_BASE_OF_CODE
#include "EmuShared.h" // For XBE_MAX_VA, XBE_IMAGE_BASE and CXBX_BASE_OF_CODE
// The following code reserves virtual addresses from 0x00011000 upwards;
#define VM_PLACEHOLDER_SIZE (XBE_MAX_VA - XBE_IMAGE_BASE - CXBX_BASE_OF_CODE)
@ -60,4 +60,4 @@ unsigned char virtual_memory_placeholder[VM_PLACEHOLDER_SIZE]; // = { OPCODE_NOP
}
#endif
#endif // RESERVEDMEMORY_H
#endif // RESERVEDMEMORY_H

2
src/common/Settings.cpp
View File

@ -37,7 +37,7 @@
#include "Settings.hpp"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include <experimental/filesystem>
// TODO: Implement Qt support when real CPU emulation is available.

0
src/common/Input/InputConfig.cpp → src/common/input/InputConfig.cpp
View File

0
src/common/Input/InputConfig.h → src/common/input/InputConfig.h
View File

0
src/common/Input/SDL2_Device.cpp → src/common/input/SDL2_Device.cpp
View File

0
src/common/Input/SDL2_Device.h → src/common/input/SDL2_Device.h
View File

0
src/common/Linux/AlignPosfix1.h → src/common/linux/AlignPosfix1.h
View File

0
src/common/Linux/AlignPrefix1.h → src/common/linux/AlignPrefix1.h
View File

0
src/common/Win32/AlignPosfix1.h → src/common/win32/AlignPosfix1.h
View File

0
src/common/Win32/AlignPrefix1.h → src/common/win32/AlignPrefix1.h
View File

2
src/common/Win32/DInputController.cpp → src/common/win32/DInputController.cpp
View File

@ -39,7 +39,7 @@
#include "DInputController.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
// This is ridiculous

0
src/common/Win32/DInputController.h → src/common/win32/DInputController.h
View File

2
src/common/Win32/EmuShared.cpp → src/common/win32/EmuShared.cpp
View File

@ -37,7 +37,7 @@
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings
#include <windows.h>

0
src/CxbxKrnl/EmuShared.h → src/common/win32/EmuShared.h
View File

2
src/common/Win32/IPCWindows.cpp → src/common/win32/IPCWindows.cpp
View File

@ -43,7 +43,7 @@
#include "gui/ResCxbx.h"
#include "Common/IPCHybrid.hpp"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "Logging.h"

0
src/common/Win32/InlineFunc.cpp → src/common/win32/InlineFunc.cpp
View File

0
src/common/Win32/Mutex.cpp → src/common/win32/Mutex.cpp
View File

0
src/common/Win32/Mutex.h → src/common/win32/Mutex.h
View File

0
src/common/Win32/Threads.cpp → src/common/win32/Threads.cpp
View File

0
src/common/Win32/Threads.h → src/common/win32/Threads.h
View File

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

@ -44,7 +44,7 @@ namespace xboxkrnl
};
#include <Shlwapi.h>
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "Logging.h"

0
src/common/Win32/XBPortMapping.h → src/common/win32/XBPortMapping.h
View File

0
src/common/XDVDFS Tools/buffered_io.cpp → src/common/xdvdfs-tools/buffered_io.cpp
View File

0
src/common/XDVDFS Tools/buffered_io.h → src/common/xdvdfs-tools/buffered_io.h
View File

0
src/common/XDVDFS Tools/xdvdfs.cpp → src/common/xdvdfs-tools/xdvdfs.cpp
View File

0
src/common/XDVDFS Tools/xdvdfs.h → src/common/xdvdfs-tools/xdvdfs.h
View File

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

@ -50,7 +50,7 @@ namespace xboxkrnl
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "gui/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "CxbxKrnl/VMManager.h" // for g_VMManager

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

@ -48,7 +48,7 @@ namespace xboxkrnl {
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "Common/Settings.hpp"

2
src/core/HLE/Intercept.cpp
View File

@ -47,7 +47,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "Common/CxbxDebugger.h"
#include "Logging.h"
#pragma comment(lib, "XbSymbolDatabase.lib")

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

@ -47,7 +47,7 @@ namespace xboxkrnl
#include "Common/Logging.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/VMManager.h"

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

@ -39,7 +39,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "Common/Win32/DInputController.h"
#include "Logging.h"

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

@ -39,7 +39,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "XInput.h"
#include <xinput.h>

2
src/core/HLE/XAPI/Xapi.cpp
View File

@ -52,7 +52,7 @@ namespace xboxkrnl
#include "CxbxKrnl/EmuFile.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "../Common/Win32/XBPortMapping.h"
#include "core/HLE/Intercept.hpp"
#include "vsbc/CxbxVSBC.h"

2
src/devices/SMCDevice.cpp
View File

@ -44,7 +44,7 @@ namespace xboxkrnl
};
#include "CxbxKrnl\CxbxKrnl.h"
#include "CxbxKrnl\EmuShared.h"
#include "EmuShared.h"
#include "SMCDevice.h" // For SMCDevice
#include "ADM1032Device.h" // For ADM1032Device

2
src/gui/DlgAbout.cpp
View File

@ -34,7 +34,7 @@
// *
// ******************************************************************
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "CxbxVersion.h"
#include "DlgAbout.h"

2
src/gui/DlgLoggingConfig.cpp
View File

@ -33,7 +33,7 @@
// ******************************************************************
#include "Logging.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "DlgLoggingConfig.h"
#include "ResCxbx.h"
#include "Common/IPCHybrid.hpp"

2
src/gui/WinMain.cpp
View File

@ -38,7 +38,7 @@
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuShared.h"
#include "EmuShared.h"
#include "Common/Settings.hpp"
#include <commctrl.h>

2
src/gui/WndMain.cpp
View File

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